generator-jhipster 8.0.0-rc.1 → 8.1.0

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', 'zone.js'] });
+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-routes': 'app/entities/entity.routes.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/README.md

@@ -0,0 +1,108 @@
+# app sub-generador
+
+`jhipster` command entrypoint, it composes with `common`, `languages`, `server`, and `client`.
+
+## Customizing
+
+JHipster implementation allows you to override almost every aspect of the generation process.
+
+[SQL/spring-data-relational customizations](https://github.com/jhipster/generator-jhipster/blob/skip_ci-architecture/generators/spring-data-relational/README.md#sqlspring-data-relational-sub-generador)
+
+### Application
+
+JDL doesn't support annotations, customizations must be done through local blueprint.
+
+`.blueprint/app/generator.mjs` (to create a local blueprint follow https://www.jhipster.tech/modules/creating-a-blueprint/#local-blueprints):
+
+```js
+get [Generator.PREPARING]() {
+  return {
+    customize({ application }) {
+      application.baseNameHumanized = 'Custom application title';
+    },
+  };
+}
+```
+
+### Entities
+
+Every annotation is loaded as entities properties and will be used at generation process.
+
+```jdl
+@CustomsProp1(customValue)
+entity Bar {}
+```
+
+`.jhipster/Bar.json`:
+
+```json
+{
+  "name": "Bar",
+  "annotations": {
+    "customsProp1": "customValue"
+  }
+}
+```
+
+#### Notable customizations
+
+##### Label
+
+```
+@EntityClassHumanized("Departamento")
+@EntityClassPluralHumanized("Departamentos")
+entity Department {}
+```
+
+##### Translation variant
+
+Translation variant allows different translations for the entity whenever applicable.
+
+```jdl
+@EntityI18nVariant('female')
+@EntityClassHumanized("Empresa")
+@EntityClassPluralHumanized("Empresas")
+entity Company {}
+```
+
+`female` variant is supported by `pt-br` locale.
+
+### Fields
+
+#### Notable customizations
+
+##### Label
+
+```jdl
+entity Company {
+  @FieldNameHumanized('Company Name')
+  company_name
+}
+```
+
+### Relationships
+
+#### Notable customizations
+
+##### Label
+
+```jdl
+relationship ManyToOnly {
+  @RelationshipNameHumanized('Company user') Company{user} to User
+}
+```
+
+##### Eager loading relationships
+
+Appliable to SQL/spring-data-relational with partial support at MongoDb/spring-data-mongodb.
+Neo4j eager loads every relationship by default.
+
+JHipster UI uses only the id and `otherEntityFieldName` properties, by default only fields used by the UI will be fetched.
+
+```jdl
+relationship OneToMany {
+  @RelationshipEagerLoad Bar to @RelationshipEagerLoad Foo
+}
+```
+
+Related issues: (#23917)[https://github.com/jhipster/generator-jhipster/issues/23917]

package/dist/generators/app/USAGE

@@ -5,3 +5,6 @@ Example:
     jhipster
 
     This will compose jhipster:client, jhipster:server and jhipster:languages to scaffold a full application
+
+More information:
+    https://github.com/jhipster/generator-jhipster/tree/main/generators/app

package/dist/generators/app/command.mjs

@@ -1,4 +1,4 @@
-import { GENERATOR_BOOTSTRAP, GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS, GENERATOR_GIT, GENERATOR_LANGUAGES, GENERATOR_SERVER, } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_CYPRESS, GENERATOR_GIT, GENERATOR_LANGUAGES, GENERATOR_SERVER, } from '../generator-list.mjs';
 const command = {
     options: {
         defaults: {
@@ -57,12 +57,12 @@ const command = {
             type: Array,
         },
     },
-    configs: {},
     import: [
         GENERATOR_BOOTSTRAP,
+        GENERATOR_BOOTSTRAP_APPLICATION_BASE,
+        GENERATOR_COMMON,
         GENERATOR_SERVER,
         GENERATOR_CLIENT,
-        GENERATOR_COMMON,
         GENERATOR_GIT,
         GENERATOR_CYPRESS,
         GENERATOR_LANGUAGES,

package/dist/generators/app/generator.mjs

@@ -25,6 +25,8 @@ import cleanupOldFilesTask from './cleanup.mjs';
 import { askForInsightOptIn } from './prompts.mjs';
 import statistics from '../statistics.mjs';
 import { GENERATOR_APP, GENERATOR_COMMON, GENERATOR_CLIENT, GENERATOR_SERVER, GENERATOR_BOOTSTRAP_APPLICATION_BASE, } from '../generator-list.mjs';
+import { getDefaultAppName } from '../project-name/support/index.mjs';
+import { packageJson } from '../../lib/index.mjs';
 import { applicationTypes, applicationOptions } from '../../jdl/jhipster/index.mjs';
 import command from './command.mjs';
 const { MICROSERVICE } = applicationTypes;
@@ -82,6 +84,7 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
     get configuring() {
         return {
             setup() {
+                this.jhipsterConfig.jhipsterVersion = packageJson.version;
                 if (this.jhipsterConfig.applicationType === MICROSERVICE) {
                     this.jhipsterConfig.skipUserManagement = true;
                 }
@@ -91,6 +94,14 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
                     this.jhipsterConfig.jhiPrefix = _.camelCase(this.jhipsterConfig.jhiPrefix);
                 }
             },
+            defaults() {
+                if (!this.options.reproducible) {
+                    this.config.defaults({
+                        baseName: getDefaultAppName(this),
+                        creationTimestamp: new Date().getTime(),
+                    });
+                }
+            },
         };
     }
     get [BaseApplicationGenerator.CONFIGURING]() {

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/command.mjs

@@ -1,4 +1,3 @@
-import { parseCreationTimestamp } from './support/timestamp.mjs';
 const command = {
     options: {
         useVersionPlaceholders: {
@@ -25,16 +24,6 @@ const command = {
             type: Boolean,
             scope: 'generator',
         },
-        skipJhipsterDependencies: {
-            description: "Don't write jhipster dependencies to package.json.",
-            type: Boolean,
-            scope: 'storage',
-        },
-        creationTimestamp: {
-            description: 'Project creation timestamp (used for reproducible builds)',
-            type: parseCreationTimestamp,
-            scope: 'storage',
-        },
         reproducible: {
             description: 'Try to reproduce changelog',
             type: Boolean,

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

@@ -21,8 +21,7 @@ import BaseGenerator from '../base/index.mjs';
 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;
@@ -43,7 +42,6 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         if (this.options.help) {
             return;
         }
-        this.parseJHipsterOptions(command.options);
         this.registerPriorities(CUSTOM_PRIORITIES);
         /* Add tasks allowing entities priorities to match normal priorities pattern */
         this.on('queueOwnTasks', () => {
@@ -51,6 +49,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             this.queueEntityTasks();
         });
         if (this.options.applicationWithEntities) {
+            this.log.warn('applicationWithEntities option is deprecated');
             // Write new definitions to memfs
             this.config.set({
                 ...this.config.getAll(),
@@ -95,7 +94,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         return this.createStorage(entityPath);
     }
     /**
-     * get sorted list of entitiy names according to changelog date (i.e. the order in which they were added)
+     * get sorted list of entity names according to changelog date (i.e. the order in which they were added)
      */
     getExistingEntityNames() {
         return this.getExistingEntities().map(entity => entity.name);
@@ -105,7 +104,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
      */
     getExistingEntities() {
         function isBefore(e1, e2) {
-            return e1.definition.changelogDate - e2.definition.changelogDate;
+            return (e1.definition.annotations?.changelogDate ?? 0) - (e2.definition.annotations?.changelogDate ?? 0);
         }
         const configDir = this.getEntitiesConfigPath();
         const entities = [];
@@ -214,7 +213,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
      */
     resetEntitiesFakeData(seed) {
         seed = `${this.sharedData.getApplication().baseName}-${seed}`;
-        this.log.debug(`Reseting entities seed with '${seed}'`);
+        this.log.debug(`Resetting entities seed with '${seed}'`);
         this.sharedData.getEntities().forEach(({ entity }) => {
             entity.resetFakerSeed(seed);
         });
@@ -259,7 +258,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) {
@@ -304,7 +303,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
     /**
      * @private
      * Get entities to load.
-     * This method doesn't filter entities. An filtered config can be changed at thie priority.
+     * This method doesn't filter entities. An filtered config can be changed at this priority.
      * @returns {string[]}
      */
     getEntitiesDataToLoad() {

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

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { existsSync, mkdirSync, opendirSync } from 'fs';
+import { existsSync, opendirSync } from 'fs';
 import { extname, basename } from 'path';
 // eslint-disable-next-line import/prefer-default-export
 export function getEntitiesFromDir(configDir) {
     if (!existsSync(configDir)) {
-        mkdirSync(configDir);
+        return [];
     }
     const dir = opendirSync(configDir);
     const entityNames = [];

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/index.mjs

@@ -28,3 +28,4 @@ export { default as prepareField } from './prepare-field.mjs';
 export * from './prepare-field.mjs';
 export { default as prepareRelationship } from './prepare-relationship.mjs';
 export * from './relationship.mjs';
+export * from './update-application-entities-transform.mjs';

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;
@@ -495,7 +499,6 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity) {
     entity.anyPropertyHasValidation =
         entity.anyPropertyHasValidation || relationships.some(({ relationshipValidate }) => relationshipValidate);
     const relationshipsByOtherEntity = relationships
-        .filter(rel => !rel.otherEntity.embedded)
         .map(relationship => [relationship.otherEntity.entityNameCapitalized, relationship])
         .reduce((relationshipsByOtherEntity, [type, relationship]) => {
         if (!relationshipsByOtherEntity[type]) {
@@ -546,14 +549,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);