generator-jhipster 8.7.3 → 8.9.0

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -23,21 +23,17 @@ import { createFaker, getMicroserviceAppName, mutateData, parseChangelog, string
 import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js';
 import { applicationTypes, databaseTypes, entityOptions, fieldTypes, searchEngineTypes } from '../../../lib/jhipster/index.js';
 import { binaryOptions } from '../../../lib/jdl/core/built-in-options/index.js';
-import { fieldIsEnum } from './field-utils.js';
 import { fieldToReference } from './prepare-field.js';
+import { fieldIsEnum } from './field-utils.js';
 const NO_SEARCH_ENGINE = searchEngineTypes.NO;
-const { PaginationTypes, ServiceTypes, MapperTypes } = entityOptions;
+const { MapperTypes } = entityOptions;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const { CommonDBTypes } = fieldTypes;
 const { BOOLEAN, LONG, STRING, UUID, INTEGER } = CommonDBTypes;
-const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
-const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
-const { SERVICE_IMPL } = ServiceTypes;
-const NO_SERVICE = ServiceTypes.NO;
-const NO_PAGINATION = PaginationTypes.NO;
+const { NO: NO_DTO } = MapperTypes;
 const NO_MAPPER = MapperTypes.NO;
 const { CASSANDRA, COUCHBASE, NEO4J, SQL, MONGODB } = databaseTypes;
-const { INSTANT, ZONED_DATE_TIME, DURATION, LOCAL_DATE, BIG_DECIMAL } = fieldTypes.CommonDBTypes;
+const { INSTANT, ZONED_DATE_TIME, DURATION, LOCAL_DATE, BIG_DECIMAL, LOCAL_TIME } = fieldTypes.CommonDBTypes;
 const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
 const { IMAGE, TEXT } = fieldTypes.BlobTypes;
 const BASE_TEMPLATE_DATA = {
@@ -87,12 +83,14 @@ function _derivedProperties(entityWithConfig) {
     const dto = entityWithConfig.dto;
     const service = entityWithConfig.service;
     mutateData(entityWithConfig, {
-        paginationPagination: pagination === PAGINATION,
-        paginationInfiniteScroll: pagination === INFINITE_SCROLL,
-        paginationNo: pagination === NO_PAGINATION,
-        dtoMapstruct: dto === MAPSTRUCT,
-        serviceImpl: service === SERVICE_IMPL,
-        serviceNo: service === NO_SERVICE,
+        paginationPagination: pagination === 'pagination',
+        paginationInfiniteScroll: pagination === 'infinite-scroll',
+        paginationNo: pagination === 'no',
+        dtoMapstruct: dto === 'mapstruct' || dto === 'any',
+        dtoAny: dto && dto !== 'no',
+        serviceClass: service === 'serviceClass',
+        serviceImpl: service === 'serviceImpl',
+        serviceNo: service === 'no',
     });
 }
 export const entityDefaultConfig = {
@@ -114,6 +112,7 @@ export const entityDefaultConfig = {
     },
 };
 export default function prepareEntity(entityWithConfig, generator, application) {
+    const { applicationTypeMicroservice, microfrontend } = application;
     const entityName = upperFirst(entityWithConfig.name);
     const entitySuffix = entityWithConfig.entitySuffix ?? application.entitySuffix;
     mutateData(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
@@ -146,21 +145,26 @@ export default function prepareEntity(entityWithConfig, generator, application)
         entityNamePlural: pluralize(entityName),
         entityAuthority: entityWithConfig.adminEntity ? 'ROLE_ADMIN' : undefined,
     });
+    mutateData(entityWithConfig, {
+        persistClass: `${entityWithConfig.entityClass}${entitySuffix ?? ''}`,
+        persistInstance: `${entityWithConfig.entityInstance}${entitySuffix ?? ''}`,
+    });
     const dto = entityWithConfig.dto && entityWithConfig.dto !== NO_DTO;
     if (dto) {
+        const { dtoSuffix = '' } = application;
         mutateData(entityWithConfig, {
-            dtoClass: `${entityWithConfig.entityClass}${application.dtoSuffix ?? ''}`,
-            dtoInstance: `${entityWithConfig.entityInstance}${application.dtoSuffix ?? ''}`,
+            dtoClass: `${entityWithConfig.entityClass}${dtoSuffix}`,
+            dtoInstance: `${entityWithConfig.entityInstance}${dtoSuffix}`,
+            restClass: ({ dtoClass }) => dtoClass,
+            restInstance: ({ dtoInstance }) => dtoInstance,
+        });
+    }
+    else {
+        mutateData(entityWithConfig, {
+            restClass: ({ persistClass }) => persistClass,
+            restInstance: ({ persistInstance }) => persistInstance,
         });
     }
-    mutateData(entityWithConfig, {
-        persistClass: `${entityWithConfig.entityClass}${entitySuffix ?? ''}`,
-        persistInstance: `${entityWithConfig.entityInstance}${entitySuffix ?? ''}`,
-    });
-    mutateData(entityWithConfig, {
-        restClass: dto ? entityWithConfig.dtoClass : entityWithConfig.persistClass,
-        restInstance: dto ? entityWithConfig.dtoInstance : entityWithConfig.persistInstance,
-    });
     mutateData(entityWithConfig, {
         entityNamePluralizedAndSpinalCased: kebabCase(entityWithConfig.entityNamePlural),
         entityClassPlural: upperFirst(entityWithConfig.entityNamePlural),
@@ -197,31 +201,27 @@ export default function prepareEntity(entityWithConfig, generator, application)
         : entityWithConfig.entityStateName);
     mutateData(entityWithConfig, {
         __override__: false,
-        i18nKeyPrefix: data => data.i18nKeyPrefix ?? `${data.frontendAppName}.${data.entityTranslationKey}`,
+        i18nKeyPrefix: data => data.i18nKeyPrefix ?? `${application.frontendAppName}.${data.entityTranslationKey}`,
         i18nAlertHeaderPrefix: data => (data.i18nAlertHeaderPrefix ?? data.microserviceAppName)
             ? `${data.microserviceAppName}.${data.entityTranslationKey}`
             : data.i18nKeyPrefix,
         hasRelationshipWithBuiltInUser: ({ relationships }) => relationships.some(relationship => relationship.otherEntity.builtInUser),
-        saveUserSnapshot: ({ hasRelationshipWithBuiltInUser, dto }) => application.applicationTypeMicroservice &&
-            application.authenticationTypeOauth2 &&
-            hasRelationshipWithBuiltInUser &&
-            dto === NO_MAPPER,
+        saveUserSnapshot: ({ hasRelationshipWithBuiltInUser, dto }) => applicationTypeMicroservice && application.authenticationTypeOauth2 && hasRelationshipWithBuiltInUser && dto === NO_MAPPER,
+        entityApi: ({ microserviceName }) => (microserviceName ? `services/${microserviceName.toLowerCase()}/` : ''),
+        entityPage: ({ microserviceName, entityFileName }) => microserviceName && microfrontend && applicationTypeMicroservice
+            ? `${microserviceName.toLowerCase()}/${entityFileName}`
+            : `${entityFileName}`,
     });
-    const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
-    entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
-    entityWithConfig.entityPage =
-        entityWithConfig.entityPage ??
-            (microfrontend && microserviceName && entityWithConfig.applicationType === MICROSERVICE
-                ? `${microserviceName.toLowerCase()}/${entityFileName}`
-                : `${entityFileName}`);
     entityWithConfig.generateFakeData = type => {
         const fieldsToGenerate = type === 'cypress' ? entityWithConfig.fields.filter(field => !field.id || !field.autoGenerate) : entityWithConfig.fields;
-        const fieldEntries = fieldsToGenerate.map(field => {
+        const fieldEntries = fieldsToGenerate
+            .map(field => {
             const fieldData = field.generateFakeData(type);
             if (!field.nullable && fieldData === null)
                 return undefined;
             return [field.fieldName, fieldData];
-        });
+        })
+            .filter(Boolean);
         const withError = fieldEntries.find(entry => !entry);
         if (withError) {
             generator.log.warn(`Error generating a full sample for entity ${entityName}`);
@@ -452,7 +452,6 @@ export function loadRequiredConfigIntoEntity(entity, config) {
         __override__: false,
         applicationType: config.applicationType,
         baseName: config.baseName,
-        frontendAppName: config.frontendAppName,
         authenticationType: config.authenticationType,
         reactive: config.reactive,
         microfrontend: config.microfrontend,
@@ -460,13 +459,11 @@ export function loadRequiredConfigIntoEntity(entity, config) {
         clientFramework: config.clientFramework,
         databaseType: config.databaseType,
         prodDatabaseType: config.prodDatabaseType,
-        skipUiGrouping: config.skipUiGrouping,
         searchEngine: config.searchEngine,
         jhiPrefix: config.jhiPrefix,
         entitySuffix: config.entitySuffix,
         dtoSuffix: config.dtoSuffix,
         packageName: config.packageName,
-        packageFolder: config.packageFolder,
         microserviceName: ({ builtIn }) => (!builtIn && config.applicationType === MICROSERVICE ? config.baseName : undefined),
     });
     if (entity.searchEngine === true && (!entity.microserviceName || entity.microserviceName === config.baseName)) {
@@ -489,6 +486,7 @@ export function preparePostEntityCommonDerivedProperties(entity) {
     entity.anyFieldHasDocumentation = entity.fields.some(({ documentation }) => documentation);
     entity.anyFieldIsZonedDateTime = fieldsType.includes(ZONED_DATE_TIME);
     entity.anyFieldIsInstant = fieldsType.includes(INSTANT);
+    entity.anyFieldIsLocalTime = fieldsType.includes(LOCAL_TIME);
     entity.anyFieldIsDuration = fieldsType.includes(DURATION);
     entity.anyFieldIsLocalDate = fieldsType.includes(LOCAL_DATE);
     entity.anyFieldIsBigDecimal = fieldsType.includes(BIG_DECIMAL);

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -26,7 +26,7 @@ import { prepareProperty } from './prepare-property.js';
 const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { Validations: { MIN, MINLENGTH, MINBYTES, MAX, MAXBYTES, MAXLENGTH, PATTERN, REQUIRED, UNIQUE }, } = validations;
 const { TEXT, IMAGE, ANY } = BlobTypes;
-const { BOOLEAN, BIG_DECIMAL, DOUBLE, DURATION, FLOAT, INSTANT, INTEGER, LOCAL_DATE, LONG, STRING, UUID, ZONED_DATE_TIME, IMAGE_BLOB, ANY_BLOB, TEXT_BLOB, BLOB, } = CommonDBTypes;
+const { BOOLEAN, BIG_DECIMAL, DOUBLE, DURATION, FLOAT, INSTANT, INTEGER, LOCAL_DATE, LONG, STRING, UUID, ZONED_DATE_TIME, IMAGE_BLOB, ANY_BLOB, TEXT_BLOB, BLOB, LOCAL_TIME, } = CommonDBTypes;
 const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes;
 const fakeStringTemplateForFieldName = columnName => {
     let fakeTemplate;
@@ -93,16 +93,13 @@ const fakeStringTemplateForFieldName = columnName => {
     return `{{${fakeTemplate}}}`;
 };
 /**
- * @param {*} field
- * @param {import('@faker-js/faker').Faker} faker
- * @param {*} changelogDate
- * @param {string} type csv, cypress, json-serializable, ts
  * @returns fake value
  */
 function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
+    let originalData;
     let data;
     for (const prop of ['fieldValidateRulesMax', 'fieldValidateRulesMin', 'fieldValidateRulesMaxlength', 'fieldValidateRulesMinlength']) {
-        if (prop in field) {
+        if (prop in field && field[prop] !== undefined) {
             try {
                 field[prop] = parseInt(field[prop], 10);
             }
@@ -112,18 +109,19 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
         }
     }
     if (field.fakerTemplate) {
-        data = faker.helpers.fake(field.fakerTemplate);
+        originalData = faker.helpers.fake(field.fakerTemplate);
+        data = originalData;
     }
     else if (field.fieldValidate && field.fieldValidateRules?.includes('pattern')) {
-        const generated = field.generateFakeDataFromPattern();
-        if (!generated) {
-            return undefined;
+        originalData = field.generateFakeDataFromPattern();
+        if (!originalData) {
+            return {};
         }
         if (type === 'csv' || type === 'cypress') {
-            data = generated.replace(/"/g, '');
+            data = originalData.replace(/"/g, '');
         }
         else {
-            data = generated;
+            data = originalData;
         }
         if (data.length === 0) {
             this.log.warn(`Generated value for pattern ${field.fieldValidateRulesPattern} is not valid.`);
@@ -157,12 +155,18 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
             min: field.fieldValidateRulesMin ?? 0,
         });
     }
-    else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE].includes(field.fieldType)) {
+    else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE, LOCAL_TIME].includes(field.fieldType)) {
         // Iso: YYYY-MM-DDTHH:mm:ss.sssZ
         const date = faker.date.recent({ days: 1, refDate: changelogDate });
-        const isoDate = date.toISOString();
+        originalData = date.toISOString();
         if (field.fieldType === LOCAL_DATE) {
-            data = isoDate.split('T')[0];
+            data = originalData.split('T')[0];
+        }
+        else if (field.fieldType === LOCAL_TIME) {
+            // time without seconds by default
+            const timeWithoutMilliseconds = originalData.split('T')[1].split('.')[0];
+            // default time input fields are set to support HH:mm. Some databases require :00 during loading of fake data to detect the datatype.
+            data = `${timeWithoutMilliseconds.substring(0, timeWithoutMilliseconds.lastIndexOf(':'))}:00`;
         }
         else if (type === 'json-serializable') {
             data = date;
@@ -171,7 +175,7 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
             // Write the date without milliseconds so Java can parse it
             // See https://stackoverflow.com/a/34053802/150868
             // YYYY-MM-DDTHH:mm:ss
-            data = isoDate.split('.')[0];
+            data = originalData.split('.')[0];
             if (type === 'cypress' || type === 'ts') {
                 // YYYY-MM-DDTHH:mm
                 data = data.substr(0, data.length - 3);
@@ -196,6 +200,7 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
     else {
         this.log.warn(`Fake data for field ${field.fieldType} is not supported`);
     }
+    originalData ??= data;
     if (field.fieldType === BYTES && type === 'json-serializable') {
         data = Buffer.from(data).toString('base64');
     }
@@ -225,7 +230,7 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
             data = `"${typeof data === 'string' ? data.replace(/"/g, '\\"') : data}"`;
         }
     }
-    return data;
+    return { data, originalData };
 }
 function _derivedProperties(field) {
     const fieldType = field.fieldType;
@@ -258,6 +263,7 @@ function _derivedProperties(field) {
         fieldTypeTimed: fieldType === ZONED_DATE_TIME || fieldType === INSTANT,
         fieldTypeCharSequence: fieldType === STRING || fieldType === UUID || fieldType === TEXT_BLOB,
         fieldTypeTemporal: fieldType === ZONED_DATE_TIME || fieldType === INSTANT || fieldType === LOCAL_DATE,
+        fieldTypeLocalTime: fieldType === LOCAL_TIME,
         fieldValidationRequired: validationRules.includes(REQUIRED),
         fieldValidationMin: validationRules.includes(MIN),
         fieldValidationMinLength: validationRules.includes(MINLENGTH),
@@ -347,28 +353,28 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
     };
     field.uniqueValue = [];
     field.generateFakeData = (type = 'csv') => {
-        let data = generateFakeDataForField.call(generator, field, faker, entityWithConfig.changelogDateForRecent, type);
+        let generated = generateFakeDataForField.call(generator, field, faker, entityWithConfig.changelogDateForRecent, type);
         // manage uniqueness
         if ((field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE)) || field.id) {
             let i = 0;
-            while (field.uniqueValue.indexOf(data) !== -1) {
+            while (field.uniqueValue.indexOf(generated.originalData) !== -1) {
                 if (i++ === 5) {
-                    data = undefined;
+                    generated = {};
                     break;
                 }
-                data = generateFakeDataForField.call(generator, field, faker, entityWithConfig.changelogDateForRecent, type);
+                generated = generateFakeDataForField.call(generator, field, faker, entityWithConfig.changelogDateForRecent, type);
             }
-            if (data === undefined) {
+            if (generated.data === undefined) {
                 generator.log.warn(`Error generating a unique value field ${field.fieldName} and type ${field.fieldType}`);
             }
             else {
-                field.uniqueValue.push(data);
+                field.uniqueValue.push(generated.originalData);
             }
         }
-        if (data === undefined) {
+        if (generated.data === undefined) {
             generator.log.warn(`Error generating fake data for field ${entityWithConfig.name}.${field.fieldName}`);
         }
-        return data;
+        return generated.data;
     };
     field.relationshipsPath = [];
     field.reference = fieldToReference(entityWithConfig, field);

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

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

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/dist/generators/base-application/support/relationship.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -20,7 +20,7 @@ import type { ValidationResult } from '../../base/api.js';
 import type { Entity } from '../../../lib/types/application/entity.js';
 import type { Relationship } from '../../../lib/types/application/relationship.js';
 export declare const otherRelationshipType: (relationshipType: any) => any;
-export declare const findOtherRelationshipInRelationships: (entityName: string, relationship: Relationship, inRelationships: Relationship[]) => Relationship<import("../../../lib/types/base/entity.js").Entity> | undefined;
+export declare const findOtherRelationshipInRelationships: (entityName: string, relationship: Relationship, inRelationships: Relationship[]) => Relationship<Entity<import("../index.js").Field, never>> | undefined;
 export declare const loadEntitiesAnnotations: (entities: Entity[]) => void;
 export declare const loadEntitiesOtherSide: (entities: Entity[], { application }?: {
     application?: any;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
+ * Copyright 2013-2025 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/dist/generators/base-application/support/task-type-inference.d.ts

@@ -1,25 +1,12 @@
 import type { ApplicationType } from '../../../lib/types/application/application.js';
 import type { TaskTypes } from '../../../lib/types/application/tasks.js';
 import type CoreGenerator from '../../base-core/generator.js';
-import type { WriteFileBlock, WriteFileSection } from '../../base/api.js';
+import type { WriteFileSection } from '../../base/api.js';
 import type { Entity } from '../../../lib/types/application/entity.js';
 export declare function asWriteFilesSection<Data = ApplicationType<Entity>>(section: WriteFileSection<Data>): WriteFileSection<Data>;
-export declare function asWriteFilesBlock<Data = ApplicationType<Entity>>(section: WriteFileBlock<Data>): WriteFileBlock<Data>;
-export declare function asInitializingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['InitializingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["InitializingTaskParam"]) => void;
 export declare function asPromptingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PromptingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PromptingTaskParam"]) => void;
-export declare function asConfiguringTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['ConfiguringTaskParam']) => void): (this: G, params: TaskTypes<E, A>["ConfiguringTaskParam"]) => void;
-export declare function asComposingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['ComposingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["ComposingTaskParam"]) => void;
-export declare function asLoadingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['LoadingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["LoadingTaskParam"]) => void;
-export declare function asPreparingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PreparingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PreparingTaskParam"]) => void;
-export declare function asPostPreparingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PostPreparingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PostPreparingTaskParam"]) => void;
-export declare function asPreparingEachEntityTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PreparingEachEntityTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PreparingEachEntityTaskParam"]) => void;
-export declare function asPreparingEachEntityFieldTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PreparingEachEntityFieldTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PreparingEachEntityFieldTaskParam"]) => void;
-export declare function asPreparingEachEntityRelationshipTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PreparingEachEntityRelationshipTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PreparingEachEntityRelationshipTaskParam"]) => void;
 export declare function asPostPreparingEachEntityTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PostPreparingEachEntityTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PostPreparingEachEntityTaskParam"]) => void;
-export declare function asDefaultTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['DefaultTaskParam']) => void): (this: G, params: TaskTypes<E, A>["DefaultTaskParam"]) => void;
 export declare function asWritingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['WritingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["WritingTaskParam"]) => void;
 export declare function asWritingEntitiesTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['WritingEntitiesTaskParam']) => void): (this: G, params: TaskTypes<E, A>["WritingEntitiesTaskParam"]) => void;
 export declare function asPostWritingTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PostWritingTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PostWritingTaskParam"]) => void;
 export declare function asPostWritingEntitiesTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['PostWritingEntitiesTaskParam']) => void): (this: G, params: TaskTypes<E, A>["PostWritingEntitiesTaskParam"]) => void;
-export declare function asInstallTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['InstallTaskParam']) => void): (this: G, params: TaskTypes<E, A>["InstallTaskParam"]) => void;
-export declare function asEndTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = CoreGenerator>(task: (this: G, params: TaskTypes<E, A>['EndTaskParam']) => void): (this: G, params: TaskTypes<E, A>["EndTaskParam"]) => void;

package/dist/generators/base-application/support/task-type-inference.js

@@ -1,45 +1,12 @@
 export function asWriteFilesSection(section) {
     return section;
 }
-export function asWriteFilesBlock(section) {
-    return section;
-}
-export function asInitializingTask(task) {
-    return task;
-}
 export function asPromptingTask(task) {
     return task;
 }
-export function asConfiguringTask(task) {
-    return task;
-}
-export function asComposingTask(task) {
-    return task;
-}
-export function asLoadingTask(task) {
-    return task;
-}
-export function asPreparingTask(task) {
-    return task;
-}
-export function asPostPreparingTask(task) {
-    return task;
-}
-export function asPreparingEachEntityTask(task) {
-    return task;
-}
-export function asPreparingEachEntityFieldTask(task) {
-    return task;
-}
-export function asPreparingEachEntityRelationshipTask(task) {
-    return task;
-}
 export function asPostPreparingEachEntityTask(task) {
     return task;
 }
-export function asDefaultTask(task) {
-    return task;
-}
 export function asWritingTask(task) {
     return task;
 }
@@ -52,9 +19,3 @@ export function asPostWritingTask(task) {
 export function asPostWritingEntitiesTask(task) {
     return task;
 }
-export function asInstallTask(task) {
-    return task;
-}
-export function asEndTask(task) {
-    return task;
-}

package/dist/generators/base-application/types.d.ts

@@ -31,12 +31,17 @@ export type BaseApplication = {
 
   nodeVersion: string;
   nodePackageManager: string;
+  /* @deprecated use nodePackageManager */
+  clientPackageManager: string;
   nodeDependencies: Record<string, string>;
 
   skipClient?: boolean;
   skipServer?: boolean;
   monorepository?: boolean;
 
+  blueprints?: { name: string; version: string }[];
+  testFrameworks?: string[];
+
   /** Customize templates sourceFile and destinationFile */
   customizeTemplatePaths: ((
     this: CoreGenerator,
@@ -104,16 +109,13 @@ type UserManagement<Entity> = {
   userManagement: Entity;
   authority: Entity;
 };
+
 type JwtApplication = {
   jwtSecretKey: string;
 };
 
 type Oauth2Application = {
-  jwtSecretKey: string;
-  generateBuiltInUserEntity?: boolean;
-  user: any;
-  generateBuiltInAuthorityEntity: false;
-  generateUserManagement: false;
+  syncUserWithIdp?: boolean;
 };
 
 type SessionApplication = {
@@ -146,6 +148,8 @@ export type CommonClientServerApplication<Entity> = BaseApplication &
   SpringBootApplication &
   ClientApplication &
   ExportApplicationPropertiesFromCommand<typeof import('../git/command.ts').default> &
+  ExportApplicationPropertiesFromCommand<typeof import('../docker/command.ts').default> &
+  import('../docker/types.d.ts').DockerApplicationType &
   ExportApplicationPropertiesFromCommand<typeof import('../project-name/command.ts').default> &
   ApplicationProperties & {
     clientRootDir: string;
@@ -177,11 +181,8 @@ export type CommonClientServerApplication<Entity> = BaseApplication &
 
     dockerServicesDir?: string;
     dockerServices?: string[];
+    prettierFolders?: string;
     prettierExtensions?: string;
-
-    skipUserManagement?: boolean;
-    syncUserWithIdp?: boolean;
-    generateUserManagement?: boolean;
   };
 
 type ServiceDiscoveryApplication = OptionWithDerivedProperties<'serviceDiscoveryType', ['no', 'eureka', 'consul']>;

package/dist/generators/base-core/generator.d.ts

@@ -83,18 +83,18 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
      *
      * @param {string} version - A valid semver version string
      */
-    isJhipsterVersionLessThan(version: any): any;
+    isJhipsterVersionLessThan(version: string): boolean;
     /**
      * Wrapper for `semver.lt` to check if the oldVersion exists and is less than the newVersion.
      * Can be used by blueprints.
      */
-    isVersionLessThan(oldVersion: string | null, newVersion: string): any;
+    isVersionLessThan(oldVersion: string | null, newVersion: string): boolean;
     /**
      * Get arguments for the priority
      */
     getArgsForPriority(priorityName: string): {
         control: import("../base/types.js").Control;
-        source: any;
+        source: import("../../lib/types/application/application.js").BaseApplicationSource;
     }[] | {
         control: import("../base/types.js").Control;
         configChanges: {
@@ -131,7 +131,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
      * Prompts for command definition configs.
      * Blueprints with command override takes precedence.
      */
-    promptCurrentJHipsterCommand(): Promise<import("@yeoman/types").PromptAnswers>;
+    promptCurrentJHipsterCommand(): Promise<import("yeoman-generator").PromptAnswers>;
     /**
      * Configure the current JHipster command.
      * Blueprints with command override takes precedence.
@@ -161,7 +161,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
         transformer?: any | ((any: any) => any);
         validate?: any | ((any: any) => any);
         name: string;
-        choices: import("../../lib/command/types.js").JHispterChoices | undefined;
+        choices: import("../../lib/command/types.js").JHipsterChoices | undefined;
     } | {
         storage: any;
         type?: "input" | "checkbox" | "confirm" | "list" | undefined;
@@ -172,7 +172,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
         transformer?: any | ((any: any) => any);
         validate?: any | ((any: any) => any);
         name: string;
-        choices: import("../../lib/command/types.js").JHispterChoices | undefined;
+        choices: import("../../lib/command/types.js").JHipsterChoices | undefined;
     })[];
     /**
      * Generate a date to be used by Liquibase changelogs.
@@ -190,7 +190,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
      * Compose with a jhipster generator using default jhipster config.
      * @return {object} the composed generator
      */
-    composeWithJHipster<const G extends string>(gen: G, options?: ComposeOptions<BaseApplicationGenerator>): Promise<BaseApplicationGenerator<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>, {
+    composeWithJHipster<const G extends string>(gen: G, options?: ComposeOptions<BaseApplicationGenerator>): Promise<BaseApplicationGenerator<{
         InitializingTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
         PromptingTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
         ConfiguringTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
@@ -221,7 +221,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
     /**
      * Compose with a jhipster generator using default jhipster config, but queue it immediately.
      */
-    dependsOnJHipster(generator: string, options?: ComposeOptions<BaseApplicationGenerator>): Promise<BaseApplicationGenerator<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>, {
+    dependsOnJHipster(generator: string, options?: ComposeOptions<BaseApplicationGenerator>): Promise<BaseApplicationGenerator<{
         InitializingTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
         PromptingTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
         ConfiguringTaskParam: import("../../lib/types/base/tasks.js").TaskParamWithControl;
@@ -251,7 +251,6 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
     }>[]>;
     /**
      * Remove File
-     * @param file
      */
     removeFile(...path: string[]): string;
     /**