generator-jhipster 8.0.0-beta.3 → 8.0.0

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

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import { upperFirst } from 'lodash-es';
 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';
-const { upperFirst } = _;
-const { LOADING, 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;
+import command from './command.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;
 /**
@@ -42,6 +43,7 @@ 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', () => {
@@ -56,8 +58,8 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             });
             if (this.options.applicationWithEntities.entities) {
                 const entities = this.options.applicationWithEntities.entities.map(entity => {
-                    const entityName = _.upperFirst(entity.name);
-                    const file = this.destinationPath(JHIPSTER_CONFIG_DIR, `${entityName}.json`);
+                    const entityName = upperFirst(entity.name);
+                    const file = this.getEntityConfigPath(entityName);
                     this.fs.writeJSON(file, { ...this.fs.readJSON(file), ...entity });
                     return entityName;
                 });
@@ -66,13 +68,20 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             delete this.options.applicationWithEntities;
         }
     }
+    /**
+     * Get Entities configuration path
+     * @returns
+     */
+    getEntitiesConfigPath(...args) {
+        return this.destinationPath(JHIPSTER_CONFIG_DIR, ...args);
+    }
     /**
      * Get Entity configuration path
      * @param entityName Entity name
      * @returns
      */
     getEntityConfigPath(entityName) {
-        return this.destinationPath(JHIPSTER_CONFIG_DIR, `${upperFirst(entityName)}.json`);
+        return this.getEntitiesConfigPath(`${upperFirst(entityName)}.json`);
     }
     /**
      * Get all the generator configuration from the .yo-rc.json file
@@ -98,7 +107,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         function isBefore(e1, e2) {
             return e1.definition.changelogDate - e2.definition.changelogDate;
         }
-        const configDir = this.destinationPath(JHIPSTER_CONFIG_DIR);
+        const configDir = this.getEntitiesConfigPath();
         const entities = [];
         for (const entityName of [...new Set((this.jhipsterConfig.entities || []).concat(getEntitiesFromDir(configDir)))]) {
             const definition = this.getEntityConfig(entityName)?.getAll();
@@ -225,6 +234,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         if (![
             LOADING,
             PREPARING,
+            POST_PREPARING,
             CONFIGURING_EACH_ENTITY,
             LOADING_ENTITIES,
             PREPARING_EACH_ENTITY,
@@ -246,6 +256,12 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             throw new Error(`BaseName (${this.jhipsterConfig.baseName}) application not available for priority ${priorityName}`);
         }
         const application = this.sharedData.getApplication();
+        if ([PREPARING, LOADING].includes(priorityName)) {
+            return {
+                application,
+                applicationDefaults: data => mutateData(application, data),
+            };
+        }
         if (LOADING_ENTITIES === priorityName) {
             return {
                 application,
@@ -276,7 +292,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
     /**
      * @private
      * Get entities to configure.
-     * 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[]}
      */
     getEntitiesDataToConfigure() {

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

@@ -34,6 +34,8 @@ const WRITING_ENTITIES = 'writingEntities';
 const WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${WRITING_ENTITIES}`;
 const POST_WRITING_ENTITIES = 'postWritingEntities';
 const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
+const LOADING_TRANSLATIONS = 'loadingTranslations';
+const LOADING_TRANSLATIONS_QUEUE = `${QUEUE_PREFIX}${LOADING_TRANSLATIONS}`;
 export const CUSTOM_PRIORITIES = [
     {
         priorityName: CONFIGURING_EACH_ENTITY,
@@ -80,6 +82,12 @@ export const CUSTOM_PRIORITIES = [
     {
         priorityName: POST_WRITING_ENTITIES,
         queueName: POST_WRITING_ENTITIES_QUEUE,
+        before: LOADING_TRANSLATIONS,
+        skip: true,
+    },
+    {
+        priorityName: LOADING_TRANSLATIONS,
+        queueName: LOADING_TRANSLATIONS_QUEUE,
         before: TRANSFORM,
         skip: true,
     },
@@ -93,6 +101,7 @@ const ENTITY_QUEUES = {
     POST_PREPARING_EACH_ENTITY_QUEUE,
     WRITING_ENTITIES_QUEUE,
     POST_WRITING_ENTITIES_QUEUE,
+    LOADING_TRANSLATIONS_QUEUE,
 };
 export const ENTITY_PRIORITY_NAMES = {
     CONFIGURING_EACH_ENTITY,
@@ -130,6 +139,7 @@ export const PRIORITY_NAMES_LIST = [
     WRITING_ENTITIES,
     PRIORITY_NAMES.POST_WRITING,
     POST_WRITING_ENTITIES,
+    LOADING_TRANSLATIONS,
     PRIORITY_NAMES_BASE.INSTALL,
     PRIORITY_NAMES_BASE.POST_INSTALL,
     PRIORITY_NAMES_BASE.END,

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 const { upperFirst } = _;
 // eslint-disable-next-line import/prefer-default-export
 export const findEntityInEntities = (entityName, entities) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName));

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { formatDocAsJavaDoc } from '../../server/support/doc.mjs';
 const doesTheEnumValueHaveACustomValue = enumValue => {
     return enumValue.includes('(');
@@ -85,7 +85,7 @@ export const getEnumInfo = (field, clientRootFolder) => {
     const customValuesState = getCustomValuesState(enums);
     return {
         enumName: field.fieldType,
-        javadoc: field.fieldTypeJavadoc && formatDocAsJavaDoc(field.fieldTypeJavadoc),
+        enumJavadoc: field.fieldTypeDocumentation && formatDocAsJavaDoc(field.fieldTypeDocumentation),
         enumInstance: field.enumInstance,
         enums,
         ...customValuesState,

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

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+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';
@@ -30,7 +30,7 @@ const { PaginationTypes, ServiceTypes, MapperTypes } = entityOptions;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const { OAUTH2 } = authenticationTypes;
 const { CommonDBTypes } = fieldTypes;
-const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
+const { BOOLEAN, LONG, STRING, UUID, INTEGER } = CommonDBTypes;
 const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const { SERVICE_IMPL } = ServiceTypes;
@@ -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('-')) {
@@ -220,13 +220,15 @@ export function derivedPrimaryKeyProperties(primaryKey) {
     _.defaults(primaryKey, {
         hasUUID: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === UUID),
         hasLong: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === LONG),
+        hasInteger: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === INTEGER),
         typeUUID: primaryKey.type === UUID,
         typeString: primaryKey.type === STRING,
         typeLong: primaryKey.type === LONG,
+        typeInteger: primaryKey.type === INTEGER,
         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;
@@ -234,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,
@@ -320,6 +326,9 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
             get name() {
                 return relationshipId.otherEntity.primaryKey.name;
             },
+            get hibernateSnakeCaseName() {
+                return hibernateSnakeCase(relationshipId.otherEntity.primaryKey.name);
+            },
             get nameCapitalized() {
                 return relationshipId.otherEntity.primaryKey.nameCapitalized;
             },
@@ -350,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;
@@ -358,6 +367,7 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
         entityWithConfig.primaryKey = {
             derived: false,
             name: primaryKeyName,
+            hibernateSnakeCaseName: hibernateSnakeCase(primaryKeyName),
             nameCapitalized: _.upperFirst(primaryKeyName),
             type: primaryKeyType,
             tsType: getTypescriptKeyType(primaryKeyType),
@@ -463,7 +473,7 @@ export function preparePostEntityCommonDerivedProperties(entity) {
     const { fields } = entity;
     const fieldsType = sortedUniq(fields.map(({ fieldType }) => fieldType).filter(fieldType => !fieldIsEnum(fieldType)));
     // TODO move to server generator
-    entity.anyFieldHasDocumentation = entity.fields.some(({ javadoc }) => javadoc);
+    entity.anyFieldHasDocumentation = entity.fields.some(({ documentation }) => documentation);
     entity.anyFieldIsZonedDateTime = fieldsType.includes(ZONED_DATE_TIME);
     entity.anyFieldIsInstant = fieldsType.includes(INSTANT);
     entity.anyFieldIsDuration = fieldsType.includes(DURATION);
@@ -540,18 +550,18 @@ 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);
-    entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerReationships apis
+    entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerRelationships apis
         ![CASSANDRA, COUCHBASE, NEO4J].includes(entity.databaseType) &&
             // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
             (entity.reactive || [SQL, MONGODB].includes(entity.databaseType)) &&

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

@@ -16,11 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { fieldTypes, validations } from '../../../jdl/jhipster/index.mjs';
 import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.mjs';
 import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.mjs';
 import { fieldIsEnum } from './field-utils.mjs';
+import { mutateData } from '../../base/support/config.mjs';
 const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { Validations: { MIN, MINLENGTH, MINBYTES, MAX, MAXBYTES, MAXLENGTH, PATTERN, REQUIRED, UNIQUE }, } = validations;
 const { TEXT, IMAGE, ANY } = BlobTypes;
@@ -267,14 +268,17 @@ export default function prepareField(entityWithConfig, field, generator) {
     return field;
 }
 function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
-    _.defaults(field, {
-        propertyName: field.fieldName,
+    mutateData(field, {
         path: [field.fieldName],
-        fieldNameCapitalized: _.upperFirst(field.fieldName),
-        fieldNameUnderscored: _.snakeCase(field.fieldName),
-        fieldNameHumanized: _.startCase(field.fieldName),
-        fieldTranslationKey: `${entityWithConfig.i18nKeyPrefix}.${field.fieldName}`,
-        tsType: getTypescriptType(field.fieldType),
+        propertyName: field.fieldName,
+        propertyNameCapitalized: ({ propertyName, propertyNameCapitalized }) => propertyNameCapitalized ?? _.upperFirst(propertyName),
+        fieldNameCapitalized: ({ fieldName, fieldNameCapitalized }) => fieldNameCapitalized ?? _.upperFirst(fieldName),
+        fieldNameUnderscored: ({ fieldName, fieldNameUnderscored }) => fieldNameUnderscored ?? _.snakeCase(fieldName),
+        fieldNameHumanized: ({ fieldName, fieldNameHumanized }) => fieldNameHumanized ?? _.startCase(fieldName),
+        fieldTranslationKey: ({ fieldName, fieldTranslationKey }) => fieldTranslationKey ?? `${entityWithConfig.i18nKeyPrefix}.${fieldName}`,
+        tsType: ({ fieldType, tsType }) => tsType ?? getTypescriptType(fieldType),
+    });
+    _.defaults(field, {
         entity: entityWithConfig,
     });
     const fieldType = field.fieldType;
@@ -369,7 +373,13 @@ export function fieldToReference(entity, field, pathPrefix = []) {
         field,
         multiple: false,
         owned: true,
-        doc: field.javadoc,
+        doc: field.documentation,
+        get propertyJavadoc() {
+            return field.fieldJavadoc;
+        },
+        get propertyApiDescription() {
+            return field.fieldApiDescription;
+        },
         label: field.fieldNameHumanized,
         name: field.fieldName,
         type: field.fieldType,

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

@@ -16,26 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 import { databaseTypes, entityOptions, reservedKeywords, validations, checkAndReturnRelationshipOnValue, } from '../../../jdl/jhipster/index.mjs';
 import { upperFirstCamelCase } from '../../base/support/string.mjs';
 import { getJoinTableName, hibernateSnakeCase } from '../../server/support/index.mjs';
 import { stringifyApplicationData } from './debug.mjs';
+import { mutateData } from '../../base/support/config.mjs';
 const { isReservedTableName } = reservedKeywords;
 const { NEO4J, NO: DATABASE_NO } = databaseTypes;
 const { MapperTypes } = entityOptions;
 const { Validations: { REQUIRED }, } = validations;
 const { MAPSTRUCT } = MapperTypes;
-function _derivedProperties(relationship) {
-    _.defaults(relationship, {
-        relationshipOneToOne: relationship.relationshipType === 'one-to-one',
-        relationshipOneToMany: relationship.relationshipType === 'one-to-many',
-        relationshipManyToOne: relationship.relationshipType === 'many-to-one',
-        relationshipManyToMany: relationship.relationshipType === 'many-to-many',
-        otherEntityUser: relationship.otherEntityName === 'user',
-    });
-}
 function _defineOnUpdateAndOnDelete(relationship, generator) {
     relationship.onDelete = checkAndReturnRelationshipOnValue(relationship.options?.onDelete, generator);
     relationship.onUpdate = checkAndReturnRelationshipOnValue(relationship.options?.onUpdate, generator);
@@ -54,12 +46,18 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
     Object.assign(relationship, {
         relationshipLeftSide: relationship.relationshipSide === 'left',
         relationshipRightSide: relationship.relationshipSide === 'right',
+        collection: relationship.relationshipType === 'one-to-many' || relationship.relationshipType === 'many-to-many',
+        relationshipOneToOne: relationship.relationshipType === 'one-to-one',
+        relationshipOneToMany: relationship.relationshipType === 'one-to-many',
+        relationshipManyToOne: relationship.relationshipType === 'many-to-one',
+        relationshipManyToMany: relationship.relationshipType === 'many-to-many',
+        otherEntityUser: relationship.otherEntityName === 'user',
     });
-    _.defaults(relationship, {
+    mutateData(relationship, {
         // let ownerSide true when type is 'many-to-one' for convenience.
         // means that this side should control the reference.
-        ownerSide: relationship.ownerSide || relationship.relationshipType === 'many-to-one' || relationship.relationshipSide === 'left',
-        collection: relationship.relationshipType === 'one-to-many' || relationship.relationshipType === 'many-to-many',
+        ownerSide: ({ ownerSide, relationshipLeftSide, relationshipManyToOne, relationshipOneToMany }) => ownerSide ?? (relationshipManyToOne || (relationshipLeftSide && !relationshipOneToMany)),
+        relationshipUpdateBackReference: ({ relationshipUpdateBackReference, ownerSide, relationshipRightSide }) => relationshipUpdateBackReference ?? (entityWithConfig.databaseType === 'neo4j' ? relationshipRightSide : !ownerSide),
     });
     relationship.otherSideReferenceExists = false;
     relationship.otherEntityIsEmbedded = otherEntityData.embedded;
@@ -130,8 +128,9 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
             : _.upperFirst(pluralize(relationship.relationshipName)),
         otherEntityNameCapitalizedPlural: pluralize(relationship.otherEntityNameCapitalized),
     });
-    _.defaults(relationship, {
+    mutateData(relationship, {
         propertyName: relationship.collection ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName,
+        propertyNameCapitalized: ({ propertyName, propertyNameCapitalized }) => propertyNameCapitalized ?? _.upperFirst(propertyName),
     });
     if (entityWithConfig.dto === MAPSTRUCT) {
         if (otherEntityData.dto !== MAPSTRUCT && !otherEntityData.builtInUser) {
@@ -205,7 +204,6 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
     }
     relationship.reference = relationshipToReference(entityWithConfig, relationship);
     _defineOnUpdateAndOnDelete(relationship, generator);
-    _derivedProperties(relationship);
     return relationship;
 }
 function relationshipToReference(entity, relationship, pathPrefix = []) {
@@ -217,7 +215,13 @@ function relationshipToReference(entity, relationship, pathPrefix = []) {
         relationship,
         owned: relationship.ownerSide,
         collection,
-        doc: relationship.javaDoc,
+        doc: relationship.documentation,
+        get propertyJavadoc() {
+            return relationship.relationshipJavadoc;
+        },
+        get propertyApiDescription() {
+            return relationship.relationshipApiDescription;
+        },
         name,
         nameCapitalized: collection ? relationship.relationshipNameCapitalizedPlural : relationship.relationshipNameCapitalized,
         get type() {

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { stringifyApplicationData } from './debug.mjs';
 import { findEntityInEntities } from './entity.mjs';
 const { upperFirst, lowerFirst } = _;

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

@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 import { basename, join as joinPath, dirname, relative, isAbsolute, join, extname } from 'path';
+import { relative as posixRelative } from 'path/posix';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'url';
 import { statSync, rmSync, existsSync, readFileSync } from 'fs';
@@ -24,7 +25,7 @@ import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import semver, { lt as semverLessThan } from 'semver';
 import YeomanGenerator from 'yeoman-generator';
@@ -37,11 +38,16 @@ import { GENERATOR_BOOTSTRAP } from '../generator-list.mjs';
 import NeedleApi from '../needle-api.mjs';
 import command from '../base/command.mjs';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.mjs';
-const { merge } = _;
-const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, LOADING, PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END } = PRIORITY_NAMES;
+import { convertConfigToOption } from '../../lib/internal/index.mjs';
+const { merge, get, set } = _;
+const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, LOADING, PREPARING, POST_PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END, } = PRIORITY_NAMES;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const asPriority = (priorityName) => `${PRIORITY_PREFIX}${priorityName}`;
+const relativeDir = (from, to) => {
+    const rel = posixRelative(from, to);
+    return rel ? `${rel}/` : '';
+};
 /**
  * This is the base class for a generator for every generator.
  */
@@ -53,6 +59,7 @@ export default class CoreGenerator extends YeomanGenerator {
     static COMPOSING = asPriority(COMPOSING);
     static LOADING = asPriority(LOADING);
     static PREPARING = asPriority(PREPARING);
+    static POST_PREPARING = asPriority(POST_PREPARING);
     static DEFAULT = asPriority(DEFAULT);
     static WRITING = asPriority(WRITING);
     static POST_WRITING = asPriority(POST_WRITING);
@@ -64,6 +71,8 @@ export default class CoreGenerator extends YeomanGenerator {
     experimental;
     debugEnabled;
     jhipster7Migration;
+    relativeDir = relativeDir;
+    relative = posixRelative;
     sharedData;
     logger;
     jhipsterConfig;
@@ -82,20 +91,6 @@ export default class CoreGenerator extends YeomanGenerator {
             unique: 'namespace',
             ...features,
         });
-        this.option('skip-prompts', {
-            description: 'Skip prompts',
-            type: Boolean,
-        });
-        this.option('skip-prettier', {
-            description: 'Skip prettier',
-            type: Boolean,
-            hide: true,
-        });
-        this.option('ignore-needles-error', {
-            description: 'Ignore needles failures',
-            type: Boolean,
-            hide: true,
-        });
         let jhipsterOldVersion = null;
         if (!this.options.help) {
             /* Force config to use 'generator-jhipster' namespace. */
@@ -164,7 +159,7 @@ export default class CoreGenerator extends YeomanGenerator {
      */
     getArgsForPriority(priorityName) {
         const control = this.sharedData.getControl();
-        if (priorityName === POST_WRITING || priorityName === PREPARING) {
+        if (priorityName === POST_WRITING || priorityName === PREPARING || priorityName === POST_PREPARING) {
             const source = this.sharedData.getSource();
             return [{ control, source }];
         }
@@ -201,15 +196,34 @@ export default class CoreGenerator extends YeomanGenerator {
         }
         return priorities;
     }
-    /**
-     * Load options from an object.
-     * When composing, we need to load options from others generators, externalising options allow to easily load them.
-     * @param options - Object containing options.
-     * @param common - skip generator scoped options.
-     */
-    parseJHipsterOptions(options, common = false) {
-        Object.entries(options).forEach(([optionName, optionDesc]) => {
-            if (!optionDesc.scope || (common && optionDesc.scope === 'generator'))
+    parseJHipsterCommand(commandDef) {
+        if (commandDef.arguments) {
+            this.parseJHipsterArguments(commandDef.arguments);
+        }
+        else if (commandDef.configs) {
+            this.parseJHipsterArguments(Object.fromEntries(Object.entries(commandDef.configs)
+                .filter(([_name, def]) => def.argument)
+                .map(([name, def]) => [
+                name,
+                {
+                    description: def.description,
+                    ...def.argument,
+                },
+            ])));
+        }
+        if (commandDef.options || commandDef.configs) {
+            this.parseJHipsterOptions(commandDef.options, commandDef.configs);
+        }
+    }
+    parseJHipsterOptions(options, configs = {}, common = false) {
+        if (typeof configs === 'boolean') {
+            common = configs;
+            configs = {};
+        }
+        Object.entries(options ?? {})
+            .concat(Object.entries(configs).map(([name, def]) => [name, convertConfigToOption(name, def)]))
+            .forEach(([optionName, optionDesc]) => {
+            if (!optionDesc?.type || !optionDesc.scope || (common && optionDesc.scope === 'generator'))
                 return;
             let optionValue;
             // Hidden options are test options, which doesn't rely on commoander for options parsing.
@@ -238,6 +252,9 @@ export default class CoreGenerator extends YeomanGenerator {
                     throw new Error(`Scope ${optionDesc.scope} not supported`);
                 }
             }
+            else if (optionDesc.default && optionDesc.scope === 'generator' && this[optionName] === undefined) {
+                this[optionName] = optionDesc.default;
+            }
         });
     }
     parseJHipsterArguments(jhipsterArguments = {}) {
@@ -259,8 +276,18 @@ export default class CoreGenerator extends YeomanGenerator {
                     argument = positionalArguments;
                     positionalArguments = [];
                 }
-                const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument);
-                this[argumentName] = convertedValue;
+                if (argument !== undefined) {
+                    const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument);
+                    if ((argumentDef.scope ?? 'generator') === 'generator') {
+                        this[argumentName] = convertedValue;
+                    }
+                    else if (argumentDef.scope === 'storage') {
+                        this.config.set(argumentName, convertedValue);
+                    }
+                    else if (argumentDef.scope === 'blueprint') {
+                        this.blueprintStorage.set(argumentName, convertedValue);
+                    }
+                }
             }
             else {
                 if (argumentDef.required) {
@@ -273,6 +300,35 @@ export default class CoreGenerator extends YeomanGenerator {
         // Arguments should only be parsed by the root generator, cleanup to don't be forwarded.
         this.options.positionalArguments = [];
     }
+    prepareQuestions(configs = {}) {
+        return Object.entries(configs)
+            .filter(([_name, def]) => def?.prompt)
+            .map(([name, def]) => {
+            const promptSpec = typeof def.prompt === 'function' ? def.prompt(this) : { ...def.prompt };
+            let storage;
+            if ((def.scope ?? 'storage') === 'storage') {
+                storage = this.config;
+                if (promptSpec.default === undefined) {
+                    promptSpec.default = () => this.jhipsterConfigWithDefaults?.[name];
+                }
+            }
+            else if (def.scope === 'blueprint') {
+                storage = this.blueprintStorage;
+            }
+            else if (def.scope === 'generator') {
+                storage = {
+                    getPath: path => get(this, path),
+                    setPath: (path, value) => set(this, path, value),
+                };
+            }
+            return {
+                name,
+                choices: def.choices,
+                ...promptSpec,
+                storage,
+            };
+        });
+    }
     /**
      * Generate a date to be used by Liquibase changelogs.
      *
@@ -745,7 +801,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 if (error instanceof Error) {
                     throw new Error(`Error editing file ${filePath}: ${error.message} at ${error.stack}`);
                 }
-                throw new Error(`Unknow Error ${error}`);
+                throw new Error(`Unknown Error ${error}`);
             }
             return writeCallback;
         };

package/dist/generators/base-entity-changes/generator.mjs

@@ -118,7 +118,7 @@ export default class GeneratorBaseEntityChanges extends GeneratorBaseApplication
             !oldRelationship.id &&
                 // check if there are relationships not anymore in the new config
                 !newRelationships.some(newRelationship => relationshipEquals(newRelationship, oldRelationship)));
-            // calcualte relationships that only need a foreign key recreation from the ones that are added
+            // calculate relationships that only need a foreign key recreation from the ones that are added
             // we need both the added and the removed ones here
             const relationshipsToRecreateForeignKeysOnly = addedRelationships
                 .filter(addedRelationship => removedRelationships.some(removedRelationship => relationshipNeedsForeignKeyRecreationOnly(removedRelationship, addedRelationship)))

package/dist/generators/base-workspaces/internal/deployments.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { applicationOptions, deploymentOptions } from '../../../jdl/index.js';
 import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.mjs';
 const { OptionNames } = applicationOptions;