generator-jhipster 8.7.3 → 8.8.0

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

@@ -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.`);
@@ -160,9 +158,9 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
     else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE].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 (type === 'json-serializable') {
             data = date;
@@ -171,7 +169,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 +194,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 +224,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;
@@ -347,28 +346,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/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 = {
@@ -177,11 +179,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

@@ -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;

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

@@ -37,9 +37,9 @@ import { convertConfigToOption, } from '../../lib/command/index.js';
 import { packageJson } from '../../lib/index.js';
 import { GENERATOR_BOOTSTRAP } from '../generator-list.js';
 import NeedleApi from '../needle-api.js';
-import command from '../base/command.js';
+import baseCommand from '../base/command.js';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
-import { loadConfig } from '../../lib/internal/index.js';
+import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
 import { dockerPlaceholderGenerator } from '../docker/utils.js';
 import { getConfigWithDefaults } from '../../lib/jhipster/index.js';
@@ -113,7 +113,7 @@ export default class CoreGenerator extends YeomanGenerator {
             this.jhipsterConfig = this.config.createProxy();
             this.sharedData = this.createSharedData({ help: this.options.help });
             /* Options parsing must be executed after forcing jhipster storage namespace and after sharedData have been populated */
-            this.parseJHipsterOptions(command.options);
+            this.parseJHipsterOptions(baseCommand.options);
             // Don't write jhipsterVersion to .yo-rc.json when reproducible
             if (this.options.namespace.startsWith('jhipster:') &&
                 !this.options.namespace.startsWith('jhipster:bootstrap') &&
@@ -328,13 +328,14 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                     const command = await this.getCurrentJHipsterCommand();
                     if (!command.configs)
                         return;
+                    const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.LOADING);
+                    const [{ application }] = taskArgs;
+                    loadConfig.call(this, command.configs, { application: application ?? this });
+                    loadDerivedConfig(command.configs, { application });
                 }
                 catch {
-                    return;
+                    // Ignore non existing command
                 }
-                const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.LOADING);
-                const [{ application }] = taskArgs;
-                await this.loadCurrentJHipsterCommandConfig(application ?? this);
             },
         });
     }

package/dist/generators/base-entity-changes/generator.d.ts

@@ -1,9 +1,7 @@
 import GeneratorBaseApplication from '../base-application/index.js';
 import type { TaskTypes as ApplicationTaskTypes } from '../../lib/types/application/tasks.js';
-import type { ApplicationType } from '../../lib/types/application/application.js';
-import type { Entity } from '../../lib/types/application/entity.js';
 import type { BaseChangelog } from './types.js';
-type TaskTypes<E, A> = ApplicationTaskTypes<E, A> & {
+type TaskTypes = ApplicationTaskTypes & {
     DefaultTaskParam: {
         entityChanges?: BaseChangelog[];
     };
@@ -17,7 +15,7 @@ type TaskTypes<E, A> = ApplicationTaskTypes<E, A> & {
 /**
  * This is the base class for a generator for every generator.
  */
-export default abstract class GeneratorBaseEntityChanges<E extends Entity = Entity, A extends ApplicationType<E> = ApplicationType<E>> extends GeneratorBaseApplication<E, A, TaskTypes<E, A>> {
+export default abstract class GeneratorBaseEntityChanges extends GeneratorBaseApplication<TaskTypes> {
     recreateInitialChangelog: boolean;
     private entityChanges;
     abstract isChangelogNew({ entityName, changelogDate }: {

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

@@ -4,6 +4,7 @@ import type { FileTransform, PipelineOptions } from 'mem-fs';
 import BaseGenerator from '../base/index.js';
 import type { GenericTaskGroup, TaskParamWithControl } from '../../lib/types/base/tasks.js';
 export default class BootstrapGenerator extends BaseGenerator {
+    [x: string]: any;
     static MULTISTEP_TRANSFORM: string;
     static PRE_CONFLICTS: string;
     upgradeCommand?: boolean;

package/dist/generators/bootstrap/generator.js

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Duplex } from 'stream';
 import { createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter';
+import { transform } from '@yeoman/transform';
 import { isFilePending, isFileStateModified } from 'mem-fs-editor/state';
 import { createCommitTransform } from 'mem-fs-editor/transform';
 import BaseGenerator from '../base/index.js';
@@ -191,13 +191,7 @@ export default class BootstrapGenerator extends BaseGenerator {
             disabled: true,
         }, ...transforms, 
         // Filter out pending files.
-        Duplex.from(async function* (files) {
-            for await (const file of files) {
-                if (isFilePending(file)) {
-                    yield file;
-                }
-            }
-        }), ...transformStreams);
+        transform((file) => (isFilePending(file) ? file : undefined)), ...transformStreams);
         this.log.ok(log ?? 'files committed to disk');
     }
 }

package/dist/generators/bootstrap/support/eslint-worker.d.ts

@@ -4,7 +4,7 @@ declare function _default({ cwd, filePath, fileContents, extensions, config, add
     fileContents: any;
     extensions: any;
     config: any;
-    additionalConfig?: any[] | undefined;
+    additionalConfig?: never[] | undefined;
     recreateEslint: any;
 }): Promise<{
     result: any;

package/dist/generators/bootstrap-application/generator.d.ts

@@ -1,5 +1,6 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class BootstrapApplicationGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
     get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "preparing">;

package/dist/generators/bootstrap-application/generator.js

@@ -63,7 +63,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                 applicationDefaults({
                     // TODO remove prettierExtensions, moved to prettier generator
                     prettierExtensions,
-                    useNpmWrapper: application => application.clientFrameworkAny && application.backendTypeJavaAny,
+                    useNpmWrapper: application => Boolean(application.clientFrameworkAny && application.backendTypeJavaAny),
                     documentationArchiveUrl: ({ jhipsterVersion }) => `${JHIPSTER_DOCUMENTATION_URL}${JHIPSTER_DOCUMENTATION_ARCHIVE_PATH}v${jhipsterVersion}`,
                 });
             },

package/dist/generators/bootstrap-application-base/generator.d.ts

@@ -1,10 +1,11 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
+    [x: string]: any;
     constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "jdlStore" | "displayLogo">;
     get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "configuring">;
-    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadApplication" | "loadNodeDependencies">;
+    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadPackageJson" | "loadNodeDependencies" | "loadApplication">;
     get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "syncUserWithIdp" | "userManagement" | "loadApplicationKeys" | "prepareApplication" | "userRelationship">;
     get configuringEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").ConfiguringEachEntityTaskParam<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>>>, "configureEntity" | "configureRelationships">;
     get loadingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").LoadingEntitiesTaskParam<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>>>, "loadingEntities" | "loadUser" | "loadUserManagement" | "loadAuthority">;

package/dist/generators/bootstrap-application-base/generator.js

@@ -101,6 +101,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                     backendType: this.jhipsterConfig.backendType ?? 'Java',
                     syncUserWithIdp: this.jhipsterConfig.syncUserWithIdp,
                     packageJsonScripts: {},
+                    clientPackageJsonScripts: {},
                 });
             },
             loadNodeDependencies({ application }) {
@@ -111,6 +112,9 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                 });
                 this.loadNodeDependenciesFromPackageJson(application.nodeDependencies, this.fetchFromInstalledJHipster(GENERATOR_COMMON, 'resources', 'package.json'));
             },
+            loadPackageJson({ application }) {
+                application.jhipsterPackageJson = packageJson;
+            },
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
@@ -289,6 +293,12 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                 loadEntitiesAnnotations(entities);
                 this.validateResult(loadEntitiesOtherSide(entities, { application }));
                 for (const entity of entities) {
+                    if (!entity.builtIn) {
+                        const invalidRelationship = entity.relationships.find(({ otherEntity }) => !otherEntity.builtIn && entity.microserviceName !== otherEntity.microserviceName);
+                        if (invalidRelationship) {
+                            throw new Error(`Microservice entities cannot have relationships with entities from other microservice: '${entity.name}.${invalidRelationship.relationshipName}'`);
+                        }
+                    }
                     for (const field of entity.fields) {
                         if (isFieldBinaryType(field)) {
                             if (isFieldBlobType(field)) {

package/dist/generators/bootstrap-application-base/utils.d.ts

@@ -1,4 +1,5 @@
 import type BaseApplicationGenerator from '../base-application/generator.js';
+import type { Entity as ApplicationEntity, UserEntity } from '../../lib/types/application/entity.js';
 export declare const auditableEntityFields: () => ({
     fieldName: string;
     fieldType: string;
@@ -18,74 +19,6 @@ export declare const auditableEntityFields: () => ({
     fieldValidateRules?: undefined;
     fieldValidateRulesMaxlength?: undefined;
 })[];
-export declare function createUserEntity(this: BaseApplicationGenerator, customUserData: {} | undefined, application: any): {
-    name: string;
-    builtIn: boolean;
-    changelogDate: string;
-    entityTableName: string;
-    relationships: never[];
-    fields: string | number | true | import("json-schema").JSONSchema7Object | import("json-schema").JSONSchema7Array;
-    dto: boolean;
-    adminUserDto: string;
-    builtInUser: boolean;
-    skipClient: any;
-    skipDbChangelog: boolean;
-    entityDomainLayer: boolean;
-    entityPersistenceLayer: boolean;
-    entityRestLayer: boolean;
-    entitySearchLayer: boolean;
-    hasImageField: boolean;
-    pagination: string;
-    auditableEntity: boolean;
-    i18nKeyPrefix: string;
-};
-export declare function createUserManagementEntity(this: BaseApplicationGenerator, customUserManagementData: {} | undefined, application: any): {
-    adminEntity: boolean;
-    builtInUser: boolean;
-    builtInUserManagement: boolean;
-    name: string;
-    skipClient: boolean;
-    skipServer: boolean;
-    changelogDate: string;
-    clientRootFolder: string;
-    entityAngularName: string;
-    entityApiUrl: string;
-    entityFileName: string;
-    entityPage: string;
-    builtIn: boolean;
-    entityTableName: string;
-    relationships: never[];
-    fields: string | number | true | import("json-schema").JSONSchema7Object | import("json-schema").JSONSchema7Array;
-    dto: boolean;
-    adminUserDto: string;
-    skipDbChangelog: boolean;
-    entityDomainLayer: boolean;
-    entityPersistenceLayer: boolean;
-    entityRestLayer: boolean;
-    entitySearchLayer: boolean;
-    hasImageField: boolean;
-    pagination: string;
-    auditableEntity: boolean;
-    i18nKeyPrefix: string;
-};
-export declare function createAuthorityEntity(this: BaseApplicationGenerator, customAuthorityData: {} | undefined, application: any): {
-    name: string;
-    entitySuffix: string;
-    clientRootFolder: string;
-    builtIn: boolean;
-    changelogDate: string;
-    adminEntity: boolean;
-    entityTableName: string;
-    relationships: never[];
-    fields: string | number | true | import("json-schema").JSONSchema7Object | import("json-schema").JSONSchema7Array;
-    builtInAuthority: boolean;
-    skipClient: any;
-    searchEngine: string;
-    service: string;
-    dto: string;
-    entityR2dbcRepository: boolean;
-    skipDbChangelog: boolean;
-    entityDomainLayer: any;
-    entityPersistenceLayer: any;
-    entityRestLayer: any;
-};
+export declare function createUserEntity(this: BaseApplicationGenerator, customUserData: {} | undefined, application: any): Partial<UserEntity>;
+export declare function createUserManagementEntity(this: BaseApplicationGenerator, customUserManagementData: {} | undefined, application: any): Partial<ApplicationEntity>;
+export declare function createAuthorityEntity(this: BaseApplicationGenerator, customAuthorityData: {} | undefined, application: any): Partial<ApplicationEntity>;

package/dist/generators/bootstrap-application-base/utils.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -20,7 +19,6 @@
 import { defaults } from 'lodash-es';
 import { Validations, authenticationTypes, databaseTypes, fieldTypes } from '../../lib/jhipster/index.js';
 import { loadRequiredConfigIntoEntity } from '../base-application/support/index.js';
-import { PaginationTypes } from '../../lib/jhipster/entity-options.js';
 import { LOGIN_REGEX, LOGIN_REGEX_JS } from '../generator-constants.js';
 import { getDatabaseTypeData } from '../server/support/database.js';
 import { formatDateForChangelog } from '../base/support/timestamp.js';
@@ -79,6 +77,7 @@ export function createUserEntity(customUserData = {}, application) {
     }
     const creationTimestamp = new Date(this.jhipsterConfig.creationTimestamp ?? Date.now());
     const cassandraOrNoDatabase = application.databaseTypeNo || application.databaseTypeCassandra;
+    const hasImageField = !cassandraOrNoDatabase;
     // Create entity definition for built-in entity to make easier to deal with relationships.
     const user = {
         name: 'User',
@@ -87,7 +86,9 @@ export function createUserEntity(customUserData = {}, application) {
         entityTableName: `${application.jhiTablePrefix}_user`,
         relationships: [],
         fields: userEntityDefinition ? userEntityDefinition.fields || [] : [],
-        dto: true,
+        dto: 'any',
+        dtoMapstruct: true,
+        dtoAny: true,
         adminUserDto: `AdminUser${application.dtoSuffix ?? ''}`,
         builtInUser: true,
         skipClient: application.clientFrameworkReact || application.clientFrameworkVue,
@@ -97,7 +98,7 @@ export function createUserEntity(customUserData = {}, application) {
         entityRestLayer: false,
         entitySearchLayer: false,
         hasImageField: !cassandraOrNoDatabase,
-        pagination: cassandraOrNoDatabase ? PaginationTypes.NO : PaginationTypes.PAGINATION,
+        pagination: cassandraOrNoDatabase ? 'no' : 'pagination',
         auditableEntity: !cassandraOrNoDatabase,
         i18nKeyPrefix: 'userManagement',
         ...customUserData,
@@ -151,7 +152,7 @@ export function createUserEntity(customUserData = {}, application) {
             fieldValidateRulesMaxlength: 191,
             builtIn: true,
         },
-        ...(user.hasImageField
+        ...(hasImageField
             ? [
                 {
                     fieldName: 'imageUrl',
@@ -184,7 +185,7 @@ export function createUserEntity(customUserData = {}, application) {
 }
 export function createUserManagementEntity(customUserManagementData = {}, application) {
     const user = createUserEntity.call(this, {}, application);
-    for (const field of user.fields) {
+    for (const field of user.fields ?? []) {
         // Login is used as the id field in rest api.
         if (field.fieldName === 'login') {
             field.id = true;

package/dist/generators/bootstrap-application-client/generator.d.ts

@@ -1,8 +1,9 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class BootStrapApplicationClient extends BaseApplicationGenerator {
+    [x: string]: any;
     constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
     get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadApplication">;
     get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareApplication">;
-    get postPreparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "control" | "postPreparingEntity">;
+    get default(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "control" | "postPreparingEntity">;
 }

package/dist/generators/bootstrap-application-client/generator.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { filterEntitiesAndPropertiesForClient, filterEntitiesForClient, loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, } from '../client/support/index.js';
+import { filterEntitiesForClient, filterEntityPropertiesForClient, loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties, } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
@@ -59,18 +59,25 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     get [BaseApplicationGenerator.PREPARING]() {
         return this.preparing;
     }
-    get postPreparingEachEntity() {
-        return this.asPostPreparingEachEntityTaskGroup({
+    get default() {
+        return this.asDefaultTaskGroup({
             control({ control }) {
-                control.filterEntitiesAndPropertiesForClient = filterEntitiesAndPropertiesForClient;
-                control.filterEntitiesForClient = filterEntitiesForClient;
+                control.filterEntitiesForClient ??= filterEntitiesForClient;
+                control.filterEntityPropertiesForClient ??= filterEntityPropertiesForClient;
+                control.filterEntitiesAndPropertiesForClient ??= entities => {
+                    entities = control.filterEntitiesForClient(entities);
+                    entities.forEach(control.filterEntityPropertiesForClient);
+                    return entities;
+                };
             },
-            postPreparingEntity({ entity }) {
-                preparePostEntityClientDerivedProperties(entity);
+            async postPreparingEntity({ entities }) {
+                for (const entity of entities) {
+                    await preparePostEntityClientDerivedProperties(entity);
+                }
             },
         });
     }
-    get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
-        return this.postPreparingEachEntity;
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.default;
     }
 }

package/dist/generators/bootstrap-application-server/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class BoostrapApplicationServer extends BaseApplicationGenerator {
+    [x: string]: any;
     constructor(args: any, options: any, features: any);
     beforeQueue(): Promise<void>;
     get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadApplication">;
@@ -27,4 +28,5 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     get preparingEachEntityField(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityFieldTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareDatabase">;
     get preparingEachEntityRelationship(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityRelationshipTaskParam<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>>>, "prepareRelationship">;
     get postPreparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "processDerivedPrimaryKeyFields">;
+    get default(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "postPreparingEntity">;
 }