generator-jhipster 8.4.0 → 8.5.0

package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js

@@ -35,7 +35,7 @@ export function convert(jdlEntities) {
 }
 function createJSONEntities(jdlEntities) {
     const convertedEntities = new Map();
-    jdlEntities.forEach(jdlEntity => {
+    jdlEntities.forEach((jdlEntity) => {
         const entityName = jdlEntity.name;
         convertedEntities.set(entityName, new JSONEntity({
             entityName,

package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js

@@ -45,7 +45,7 @@ export function convert(jdlObject) {
 }
 function getConvertedFieldsForEntity(jdlEntity, jdlObject) {
     const convertedEntityFields = [];
-    jdlEntity.forEachField(jdlField => {
+    jdlEntity.forEachField((jdlField) => {
         let fieldData = {
             fieldName: camelCase(jdlField.name),
             fieldType: jdlField.type,
@@ -55,12 +55,12 @@ function getConvertedFieldsForEntity(jdlEntity, jdlObject) {
             fieldData.documentation = comment;
         }
         if (jdlObject.hasEnum(jdlField.type)) {
-            fieldData.fieldValues = jdlObject.getEnum(fieldData.fieldType).getValuesAsString();
-            const fieldTypeComment = jdlObject.getEnum(fieldData.fieldType).comment;
+            fieldData.fieldValues = jdlObject.getEnum(fieldData.fieldType)?.getValuesAsString();
+            const fieldTypeComment = jdlObject.getEnum(fieldData.fieldType)?.comment;
             if (fieldTypeComment) {
                 fieldData.fieldTypeDocumentation = fieldTypeComment;
             }
-            const fieldValuesJavadocs = jdlObject.getEnum(fieldData.fieldType).getValueJavadocs();
+            const fieldValuesJavadocs = jdlObject.getEnum(fieldData.fieldType)?.getValueJavadocs();
             if (fieldValuesJavadocs && Object.keys(fieldValuesJavadocs).length > 0) {
                 fieldData.fieldValuesJavadocs = fieldValuesJavadocs;
             }

package/dist/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js

@@ -30,13 +30,13 @@ export default { convert };
  * @param {JDLObject} args.jdlObject - the JDLObject to convert to JSON
  * @returns {Map} entities that can be exported to JSON
  */
-export function convert(args = {}) {
-    if (!args.jdlObject) {
+export function convert(args) {
+    if (!args?.jdlObject) {
         throw new Error('The JDL object is mandatory.');
     }
     init(args);
     setEntitiesPerApplication();
-    if (entitiesPerApplication.size === 0) {
+    if (entitiesPerApplication.size === 0 && jdlObject) {
         const applicationNames = jdlObject.getApplications().map(jdlApplication => jdlApplication.getConfigurationOptionValue('baseName'));
         return new Map(applicationNames.map(applicationName => [applicationName, []]));
     }
@@ -63,7 +63,7 @@ function resetState() {
     entities = null;
 }
 function setEntitiesPerApplication() {
-    jdlObject.forEachApplication(jdlApplication => {
+    jdlObject?.forEachApplication((jdlApplication) => {
         const entityNames = jdlApplication.getEntityNames();
         if (entityNames.length === 0) {
             return;
@@ -85,15 +85,15 @@ function setFields() {
     });
 }
 function setRelationships() {
-    const convertedRelationships = RelationshipConverter.convert(jdlObject.getRelationships(), jdlObject.getEntityNames());
+    const convertedRelationships = RelationshipConverter.convert(jdlObject?.getRelationships(), jdlObject?.getEntityNames());
     convertedRelationships.forEach((entityRelationships, entityName) => {
         entities[entityName].addRelationships(entityRelationships);
     });
 }
 function setApplicationToEntities() {
-    jdlObject.forEachApplication(jdlApplication => {
+    jdlObject?.forEachApplication((jdlApplication) => {
         const baseName = jdlApplication.getConfigurationOptionValue('baseName');
-        jdlApplication.forEachEntityName(entityName => {
+        jdlApplication.forEachEntityName((entityName) => {
             if (!entities[entityName]) {
                 return;
             }
@@ -106,7 +106,7 @@ function setOptions(entitiesForEachApplication) {
     convertedOptionContents.forEach((optionContent, entityName) => {
         entities[entityName].setOptions(optionContent);
     });
-    jdlObject.forEachApplication(jdlApplication => {
+    jdlObject?.forEachApplication(jdlApplication => {
         const convertedOptionContentsForApplication = OptionConverter.convert(jdlApplication);
         const applicationName = jdlApplication.getConfigurationOptionValue('baseName');
         const applicationEntities = entitiesForEachApplication.get(applicationName);
@@ -140,7 +140,7 @@ function formatEntitiesForEachApplication(entitiesForEachApplication) {
     });
 }
 function addApplicationsWithoutEntities(entitiesForEachApplication) {
-    jdlObject.forEachApplication(jdlApplication => {
+    jdlObject?.forEachApplication(jdlApplication => {
         if (jdlApplication.getEntityNames().length === 0) {
             entitiesForEachApplication.set(jdlApplication.getConfigurationOptionValue('baseName'), []);
         }

package/dist/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js

@@ -34,8 +34,8 @@ export default {
  * @param {string} args.applicationType - the application's type
  * @returns {Map} entities that can be exported to JSON
  */
-export function convert(args = {}) {
-    if (!args.jdlObject || !args.applicationName || !args.databaseType) {
+export function convert(args) {
+    if (!args?.jdlObject || !args.applicationName || !args.databaseType) {
         throw new Error("The JDL object, the application's name, and its the database type are mandatory.");
     }
     init(args);

package/dist/jdl/converters/json-to-jdl-application-converter.js

@@ -22,7 +22,7 @@ const GENERATOR_NAME = 'generator-jhipster';
 export function convertApplicationsToJDL({ applications, jdl } = {}) {
     const jsonApplications = applications || [];
     const jdlObject = jdl || new JDLObject();
-    jsonApplications.forEach(application => {
+    jsonApplications.forEach((application) => {
         const convertedApplication = convertApplicationToJDL({ application });
         jdlObject.addApplication(convertedApplication);
     });

package/dist/jdl/converters/json-to-jdl-converter.js

@@ -87,7 +87,7 @@ export function getJDLObjectFromSingleApplication(yoRcFileContent, entities, exi
         existingJDLObject.addApplication(jdlApplication);
         return existingJDLObject;
     }
-    const jdlObject = convertEntitiesToJDL({ entities });
+    const jdlObject = convertEntitiesToJDL(entities);
     entities.forEach((entity, entityName) => jdlApplication.addEntityName(entityName));
     jdlObject.addApplication(jdlApplication);
     return mergeJDLObjects(existingJDLObject, jdlObject);
@@ -97,20 +97,21 @@ function cleanYoRcFileContent(yoRcFileContent) {
         yoRcFileContent[key] = removeFieldsWithNullishValues(yoRcFileContent[key]);
     }
     delete yoRcFileContent[GENERATOR_JHIPSTER].promptValues;
+    const result = structuredClone(yoRcFileContent);
     if (yoRcFileContent[GENERATOR_JHIPSTER].blueprints) {
-        yoRcFileContent[GENERATOR_JHIPSTER].blueprints = yoRcFileContent[GENERATOR_JHIPSTER].blueprints.map(blueprint => blueprint.name);
+        result[GENERATOR_JHIPSTER].blueprints = yoRcFileContent[GENERATOR_JHIPSTER].blueprints.map(blueprint => blueprint.name);
     }
     if (yoRcFileContent[GENERATOR_JHIPSTER].microfrontends) {
-        yoRcFileContent[GENERATOR_JHIPSTER].microfrontends = yoRcFileContent[GENERATOR_JHIPSTER].microfrontends.map(({ baseName }) => baseName);
+        result[GENERATOR_JHIPSTER].microfrontends = yoRcFileContent[GENERATOR_JHIPSTER].microfrontends.map(({ baseName }) => baseName);
     }
-    return yoRcFileContent;
+    return result;
 }
 function getJSONEntityFiles(applicationDirectory) {
     const entities = new Map();
     fs.readdirSync(path.join(applicationDirectory, '.jhipster')).forEach(file => {
+        const entityName = file.slice(0, file.indexOf('.json'));
         const jsonFilePath = path.join(applicationDirectory, '.jhipster', file);
         if (fs.statSync(jsonFilePath).isFile() && file.endsWith('.json')) {
-            const entityName = file.slice(0, file.indexOf('.json'));
             entities.set(entityName, readJSONFile(jsonFilePath));
         }
     });

package/dist/jdl/converters/json-to-jdl-entity-converter.js

@@ -43,17 +43,17 @@ let jdlObject;
  * @param params.entities - a Map having for keys the entity names and values the JSON entity files.
  * @return the parsed entities in the JDL form.
  */
-export function convertEntitiesToJDL(params) {
-    if (!params.entities) {
+export function convertEntitiesToJDL(entities) {
+    if (!entities) {
         throw new Error('Entities have to be passed to be converted.');
     }
-    init(params);
+    init(entities);
     addEntities();
     addRelationshipsToJDL();
     return jdlObject;
 }
-function init(params) {
-    entities = params.entities;
+function init(ents) {
+    entities = ents;
     jdlObject = new JDLObject();
 }
 function addEntities() {
@@ -90,9 +90,7 @@ function convertJSONToJDLField(field) {
     if (jdlField.type === BYTES) {
         jdlField.type = getTypeForBlob(field.fieldTypeBlobContent);
     }
-    if (field.fieldValidateRules) {
-        addValidations(jdlField, field);
-    }
+    addValidations(jdlField, field);
     return jdlField;
 }
 function getTypeForBlob(blobContentType) {
@@ -102,9 +100,11 @@ function getTypeForBlob(blobContentType) {
     throw new Error(`Unrecognised blob type: '${blobContentType}'`);
 }
 function addValidations(jdlField, field) {
-    field.fieldValidateRules.forEach(rule => {
-        jdlField.addValidation(convertJSONToJDLValidation(rule, field));
-    });
+    if (field.fieldValidateRules) {
+        field.fieldValidateRules.forEach((rule) => {
+            jdlField.addValidation(convertJSONToJDLValidation(rule, field));
+        });
+    }
 }
 function convertJSONToJDLValidation(rule, field) {
     return new JDLValidation({
@@ -113,7 +113,7 @@ function convertJSONToJDLValidation(rule, field) {
     });
 }
 function addEnumsToJDL(entity) {
-    entity?.fields?.forEach(field => {
+    entity?.fields?.forEach((field) => {
         if (field.fieldValues !== undefined) {
             jdlObject.addEnum(new JDLEnum({
                 name: field.fieldType,
@@ -281,13 +281,13 @@ function addEntityOptionsToJDL(entity, entityName) {
 function addUnaryOptionToJDL(unaryOption, entityName) {
     jdlObject.addOption(new JDLUnaryOption({
         name: unaryOption,
-        entityNames: [entityName],
+        entityNames: new Set([entityName]),
     }));
 }
 function addBinaryOptionToJDL(binaryOption, value, entityName) {
     jdlObject.addOption(new JDLBinaryOption({
         name: binaryOption,
         value,
-        entityNames: [entityName],
+        entityNames: new Set([entityName]),
     }));
 }

package/dist/jdl/converters/json-to-jdl-option-converter.js

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 import JDLObject from '../models/jdl-object.js';
-import JDLUnaryOption from '../models/jdl-unary-option.js';
 import { unaryOptions } from '../jhipster/index.js';
+import JDLUnaryOption from '../models/jdl-unary-option.js';
 const { SKIP_CLIENT, SKIP_SERVER } = unaryOptions;
 export default {
     convertServerOptionsToJDL,
@@ -36,7 +36,6 @@ export function convertServerOptionsToJDL(config, jdl) {
         if (jhipsterConfig[option] === true) {
             jdlObject.addOption(new JDLUnaryOption({
                 name: option,
-                value: jhipsterConfig[option],
             }));
         }
     });

package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js

@@ -40,7 +40,7 @@ export function convertApplications(parsedApplications) {
     });
 }
 function getEntityOptionsInApplication(parsedApplication) {
-    return convertOptions(parsedApplication.options, parsedApplication.useOptions);
+    return convertOptions(parsedApplication.options, parsedApplication.useOptions || []);
 }
 /**
  * Checks whether the entity names used in the options are present in the entity names declared for the application.

package/dist/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js

@@ -38,7 +38,7 @@ export function convertOptions(parsedOptions, useOptions) {
 }
 function convertUnaryOptions(parsedOptions) {
     const convertedUnaryOptions = [];
-    unaryOptions.forEach(unaryOptionName => {
+    unaryOptions.forEach((unaryOptionName) => {
         const parsedUnaryOption = parsedOptions[unaryOptionName];
         if (!parsedUnaryOption || !parsedUnaryOption.list || parsedUnaryOption.list.length === 0) {
             return;
@@ -53,7 +53,7 @@ function convertUnaryOptions(parsedOptions) {
 }
 function convertBinaryOptions(parsedOptions) {
     const convertedBinaryOptions = [];
-    binaryOptions.forEach(binaryOptionName => {
+    binaryOptions.forEach((binaryOptionName) => {
         if (!parsedOptions[binaryOptionName]) {
             return;
         }

package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js

@@ -61,20 +61,20 @@ function init(passedConfiguration) {
     configuration = passedConfiguration;
     jdlObject = new JDLObject();
     entityNames = parsedContent.entities.map(entity => entity.name);
-    applicationsPerEntityName = {};
+    applicationsPerEntityName = new Map();
 }
 function fillApplications() {
     // TODO: Function which expects two arguments is called with three.
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     const jdlApplications = convertApplications(parsedContent.applications, configuration, entityNames);
-    jdlApplications.forEach(jdlApplication => {
+    jdlApplications.forEach((jdlApplication) => {
         jdlObject.addApplication(jdlApplication);
         fillApplicationsPerEntityName(jdlApplication);
     });
 }
 function fillApplicationsPerEntityName(application) {
-    application.forEachEntityName(entityName => {
+    application.forEachEntityName((entityName) => {
         applicationsPerEntityName[entityName] = applicationsPerEntityName[entityName] || [];
         applicationsPerEntityName[entityName].push(application);
     });
@@ -99,11 +99,12 @@ function fillClassesAndFields() {
 }
 function getJDLFieldsFromParsedEntity(entity) {
     const fields = [];
-    for (let i = 0; i < entity.body.length; i++) {
-        const field = entity.body[i];
+    const arr = entity.body || [];
+    for (let i = 0; i < arr.length; i++) {
+        const field = arr[i];
         const jdlField = convertField(field);
         jdlField.validations = getValidations(field);
-        jdlField.options = convertAnnotationsToOptions(field.annotations);
+        jdlField.options = convertAnnotationsToOptions(field.annotations || []);
         fields.push(jdlField);
     }
     return fields;

package/dist/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js

@@ -32,7 +32,7 @@ export function convertValidations(validations, constantValueGetter) {
     }
     return validations.reduce((jdlValidations, parsedValidation) => {
         if (parsedValidation) {
-            jdlValidations.push(convertValidation(parsedValidation, constantValueGetter));
+            jdlValidations = [...jdlValidations, convertValidation(parsedValidation, constantValueGetter)];
         }
         return jdlValidations;
     }, []);

package/dist/jdl/exporters/applications/jhipster-application-formatter.js

@@ -20,34 +20,26 @@ import { GENERATOR_NAME } from '../export-utils.js';
 /**
  * Exports JDL applications to JDL files in separate folders (based on application base names).
  * @param applications the applications to exporters (key: application name, value: a JDLApplication).
- * @param {Object} [configuration]
  * @return object[] exported applications in their final form.
  */
-export function formatApplicationsToExport(applications, configuration) {
+export function formatApplicationsToExport(applications) {
     if (!applications) {
         throw new Error('Applications have to be passed to be exported.');
     }
     return Object.values(applications).map(application => {
-        // TODO: This is probably a bug, too many arguments given.
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        return setUpApplicationStructure(application, configuration);
+        return setUpApplicationStructure(application);
     });
 }
 /**
  * Exports JDL a application to a JDL file in the current directory.
  * @param {Object} application - the JDL application to export.
- * @param {Object} [configuration]
  * @return {Object} the exported application in its final form.
  */
-export function formatApplicationToExport(application, configuration = {}) {
-    // TODO: This is probably a bug, too many arguments given.
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error
-    return setUpApplicationStructure(application, configuration);
+export function formatApplicationToExport(application) {
+    return setUpApplicationStructure(application);
 }
 function setUpApplicationStructure(application) {
-    let applicationToExport = {
+    const applicationToExport = {
         [GENERATOR_NAME]: {},
     };
     applicationToExport[GENERATOR_NAME] = getApplicationConfig(application);
@@ -58,12 +50,12 @@ function setUpApplicationStructure(application) {
     if (application.hasConfigurationOption('creationTimestamp')) {
         applicationToExport[GENERATOR_NAME].creationTimestamp = parseInt(application.getConfigurationOptionValue('creationTimestamp'), 10);
     }
-    applicationToExport = cleanUpOptions(applicationToExport);
-    return applicationToExport;
+    const postProcessedApplicationToExport = cleanUpOptions(applicationToExport);
+    return postProcessedApplicationToExport;
 }
 function getApplicationConfig(application) {
     const result = {};
-    application.forEachConfigurationOption(option => {
+    application.forEachConfigurationOption((option) => {
         result[option.name] = option.getValue();
     });
     return result;
@@ -73,7 +65,7 @@ function getApplicationNamespaceConfig(application) {
         return undefined;
     }
     const result = {};
-    application.forEachNamespaceConfiguration(configurationOption => {
+    application.forEachNamespaceConfiguration((configurationOption) => {
         result[configurationOption.namespace] = result[configurationOption.namespace] ?? {};
         configurationOption.forEachOption(option => {
             result[configurationOption.namespace][option.name] = option.getValue();
@@ -82,19 +74,20 @@ function getApplicationNamespaceConfig(application) {
     return result;
 }
 function cleanUpOptions(application) {
-    if (!application[GENERATOR_NAME].frontEndBuilder) {
-        delete application[GENERATOR_NAME].frontEndBuilder;
+    const res = structuredClone(application);
+    if (res[GENERATOR_NAME].frontEndBuilder) {
+        delete res[GENERATOR_NAME].frontEndBuilder;
     }
-    delete application.entityNames;
+    delete res.entityNames;
     if (application[GENERATOR_NAME].blueprints) {
-        application[GENERATOR_NAME].blueprints = application[GENERATOR_NAME].blueprints.map(blueprintName => ({
+        res[GENERATOR_NAME].blueprints = application[GENERATOR_NAME].blueprints.map(blueprintName => ({
             name: blueprintName,
         }));
     }
     if (application[GENERATOR_NAME].microfrontends) {
-        application[GENERATOR_NAME].microfrontends = application[GENERATOR_NAME].microfrontends.map(baseName => ({
+        res[GENERATOR_NAME].microfrontends = application[GENERATOR_NAME].microfrontends.map(baseName => ({
             baseName,
         }));
     }
-    return application;
+    return res;
 }

package/dist/jdl/exporters/config.js

@@ -1,5 +1,6 @@
 import { GENERATOR_NAME } from './export-utils.js';
 export const mergeYoRcContent = (oldConfig, newConfig) => {
+    // @ts-expect-error partial assignment
     const merged = { [GENERATOR_NAME]: {} };
     for (const ns of new Set([...Object.keys(oldConfig), ...Object.keys(newConfig)])) {
         merged[ns] = { ...oldConfig[ns], ...newConfig[ns] };

package/dist/jdl/exporters/jhipster-deployment-exporter.js

@@ -31,9 +31,9 @@ export default function exportDeployments(deployments) {
     }
     return Object.values(deployments).map(deployment => {
         checkForErrors(deployment);
-        deployment = setUpDeploymentStructure(deployment);
-        writeDeploymentConfigs(deployment);
-        return deployment;
+        const yoRcDeployment = setUpDeploymentStructure(deployment);
+        writeDeploymentConfigs(yoRcDeployment);
+        return yoRcDeployment;
     });
 }
 function checkForErrors(deployment) {
@@ -49,8 +49,8 @@ function setUpDeploymentStructure(deployment) {
     return deploymentToExport;
 }
 function setUpArrayOptions(deployment) {
-    deployment[GENERATOR_NAME].appsFolders = Array.from(deployment[GENERATOR_NAME].appsFolders);
-    deployment[GENERATOR_NAME].clusteredDbApps = Array.from(deployment[GENERATOR_NAME].clusteredDbApps);
+    deployment[GENERATOR_NAME].appsFolders = Array.from(deployment[GENERATOR_NAME]?.appsFolders || []);
+    deployment[GENERATOR_NAME].clusteredDbApps = Array.from(deployment[GENERATOR_NAME]?.clusteredDbApps || []);
     return deployment;
 }
 /**

package/dist/jdl/exporters/jhipster-entity-exporter.js

@@ -55,7 +55,7 @@ function init(passedConfiguration) {
  * @param subFolder the folder (to create) in which the JHipster entity folder will be.
  */
 function updateEntities(subFolder) {
-    return configuration.entities.map(entity => {
+    return configuration.entities.map((entity) => {
         const filePath = path.join(subFolder, toFilePath(entity.name));
         return updateEntityToGenerateWithExistingOne(filePath, entity);
     });

package/dist/jdl/jdl-importer.js

@@ -29,8 +29,10 @@ import exportEntities from './exporters/jhipster-entity-exporter.js';
 import createWithApplicationValidator from './validators/jdl-with-application-validator.js';
 import createWithoutApplicationValidator from './validators/jdl-without-application-validator.js';
 import { applicationOptions } from './jhipster/index.js';
+import { GENERATOR_NAME } from './exporters/export-utils.js';
 const { OptionNames } = applicationOptions;
 const { APPLICATION_TYPE, BASE_NAME } = OptionNames;
+const GENERATOR_JHIPSTER = 'generator-jhipster'; // can't use the one of the generator as it circles
 /**
  * Creates a new JDL importer from files.
  * There are two ways to create an importer:
@@ -99,10 +101,10 @@ function makeJDLImporter(content, configuration) {
                 importState.exportedEntities = importOnlyEntities(jdlObject, configuration);
             }
             else if (jdlObject.getApplicationQuantity() === 1) {
-                importState = importOneApplicationAndEntities(jdlObject, configuration);
+                importState = importOneApplicationAndEntities(jdlObject);
             }
             else {
-                importState = importApplicationsAndEntities(jdlObject, configuration);
+                importState = importApplicationsAndEntities(jdlObject);
             }
             if (jdlObject.getDeploymentQuantity()) {
                 importState.exportedDeployments = importDeployments(jdlObject.deployments);
@@ -119,9 +121,9 @@ function getJDLObject(parsedJDLContent, configuration) {
     let applicationType = configuration.applicationType;
     let databaseType = configuration.databaseType;
     if (configuration.application) {
-        baseName = configuration.application['generator-jhipster'].baseName;
-        applicationType = configuration.application['generator-jhipster'].applicationType;
-        databaseType = configuration.application['generator-jhipster'].databaseType;
+        baseName = configuration.application[GENERATOR_JHIPSTER].baseName;
+        applicationType = configuration.application[GENERATOR_JHIPSTER].applicationType;
+        databaseType = configuration.application[GENERATOR_JHIPSTER].databaseType;
     }
     return ParsedJDLToJDLObjectConverter.parseFromConfigurationObject({
         parsedContent: parsedJDLContent,
@@ -140,15 +142,15 @@ function checkForErrors(jdlObject, configuration, logger = console) {
         let applicationType = configuration.applicationType;
         let databaseType = configuration.databaseType;
         let blueprints = configuration.blueprints;
-        if (application && application['generator-jhipster']) {
+        if (application && application[GENERATOR_JHIPSTER]) {
             if (applicationType === undefined) {
-                applicationType = application['generator-jhipster'].applicationType;
+                applicationType = application[GENERATOR_JHIPSTER].applicationType;
             }
             if (databaseType === undefined) {
-                databaseType = application['generator-jhipster'].databaseType;
+                databaseType = application[GENERATOR_JHIPSTER].databaseType;
             }
             if (blueprints === undefined) {
-                blueprints = application['generator-jhipster'].blueprints;
+                blueprints = application[GENERATOR_JHIPSTER].blueprints;
             }
         }
         validator = createWithoutApplicationValidator(jdlObject, {
@@ -168,15 +170,15 @@ function importOnlyEntities(jdlObject, configuration) {
     if (!configuration.application && doesFileExist('.yo-rc.json')) {
         application = readJSONFile('.yo-rc.json');
     }
-    if (application && application['generator-jhipster']) {
+    if (application && application[GENERATOR_JHIPSTER]) {
         if (applicationType === undefined) {
-            applicationType = application['generator-jhipster'].applicationType;
+            applicationType = application[GENERATOR_JHIPSTER].applicationType;
         }
         if (applicationName === undefined) {
-            applicationName = application['generator-jhipster'].baseName;
+            applicationName = application[GENERATOR_JHIPSTER].baseName;
         }
         if (databaseType === undefined) {
-            databaseType = application['generator-jhipster'].databaseType;
+            databaseType = application[GENERATOR_JHIPSTER].databaseType;
         }
     }
     const entitiesPerApplicationMap = JDLWithoutApplicationToJSONConverter.convert({
@@ -188,14 +190,14 @@ function importOnlyEntities(jdlObject, configuration) {
     const jsonEntities = entitiesPerApplicationMap.get(applicationName);
     return exportJSONEntities(jsonEntities, configuration);
 }
-function importOneApplicationAndEntities(jdlObject, configuration) {
+function importOneApplicationAndEntities(jdlObject) {
     const importState = {
         exportedApplications: [],
         exportedApplicationsWithEntities: {},
         exportedEntities: [],
         exportedDeployments: [],
     };
-    const formattedApplication = formatApplicationToExport(jdlObject.getApplications()[0], configuration);
+    const formattedApplication = formatApplicationToExport(jdlObject.getApplications()[0]);
     importState.exportedApplications.push(formattedApplication);
     const jdlApplication = jdlObject.getApplications()[0];
     const applicationName = jdlApplication.getConfigurationOptionValue(BASE_NAME);
@@ -203,7 +205,7 @@ function importOneApplicationAndEntities(jdlObject, configuration) {
         jdlObject,
     });
     const jsonEntities = entitiesPerApplicationMap.get(applicationName);
-    const { 'generator-jhipster': config, ...remaining } = formattedApplication;
+    const { [GENERATOR_NAME]: config, ...remaining } = formattedApplication;
     importState.exportedApplicationsWithEntities[applicationName] = {
         config,
         ...remaining,
@@ -220,14 +222,14 @@ function importOneApplicationAndEntities(jdlObject, configuration) {
     }
     return importState;
 }
-function importApplicationsAndEntities(jdlObject, configuration) {
+function importApplicationsAndEntities(jdlObject) {
     const importState = {
         exportedApplications: [],
         exportedApplicationsWithEntities: {},
         exportedEntities: [],
         exportedDeployments: [],
     };
-    const formattedApplications = formatApplicationsToExport(jdlObject.applications, configuration);
+    const formattedApplications = formatApplicationsToExport(jdlObject.applications);
     importState.exportedApplications = formattedApplications;
     const entitiesPerApplicationMap = convert({
         jdlObject,
@@ -257,8 +259,8 @@ function exportJSONEntities(entities, configuration) {
     let baseName = configuration.applicationName;
     let applicationType = configuration.applicationType;
     if (configuration.application) {
-        baseName = configuration.application['generator-jhipster'].baseName;
-        applicationType = configuration.application['generator-jhipster'].applicationType;
+        baseName = configuration.application[GENERATOR_JHIPSTER].baseName;
+        applicationType = configuration.application[GENERATOR_JHIPSTER].applicationType;
     }
     return exportEntities({
         entities,

package/dist/jdl/jhipster/binary-options.js

@@ -33,15 +33,19 @@ const Options = {
     CLIENT_ROOT_FOLDER: 'clientRootFolder',
 };
 const optionNames = Object.values(Options);
+const dtoValues = { MAPSTRUCT, NO: NO_MAPPER };
+const serviceValues = { SERVICE_CLASS, SERVICE_IMPL, NO: NO_SERVICE };
+const paginationValues = {
+    PAGINATION: PaginationTypes.PAGINATION,
+    'INFINITE-SCROLL': PaginationTypes.INFINITE_SCROLL,
+    NO: PaginationTypes.NO,
+};
+const searchValues = { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH };
 const Values = {
-    [Options.DTO]: { MAPSTRUCT, NO: NO_MAPPER },
-    [Options.SERVICE]: { SERVICE_CLASS, SERVICE_IMPL, NO: NO_SERVICE },
-    [Options.PAGINATION]: {
-        PAGINATION: PaginationTypes.PAGINATION,
-        'INFINITE-SCROLL': PaginationTypes.INFINITE_SCROLL,
-        NO: PaginationTypes.NO,
-    },
-    [Options.SEARCH]: { ELASTICSEARCH, COUCHBASE, NO: NO_SEARCH },
+    dto: dtoValues,
+    service: serviceValues,
+    pagination: paginationValues,
+    search: searchValues,
 };
 const DefaultValues = {
     [Options.DTO]: Values[Options.DTO].NO,

package/dist/jdl/jhipster/json-entity.js

@@ -47,7 +47,7 @@ class JSONEntity {
         const merged = merge(getDefaults(args.entityName), args);
         this.name = merged.name;
         this.fields = merged.fields;
-        this.annotations = merged.annotations;
+        this.annotations = merged.annotations ?? {};
         this.relationships = merged.relationships;
         this.documentation = merged.documentation;
         this.entityTableName = merged.entityTableName;

package/dist/jdl/models/abstract-jdl-option.js

@@ -50,8 +50,8 @@ export default class AbstractJDLOption {
         if (!option) {
             return false;
         }
-        addAll(this.entityNames, option.entityNames);
-        addAll(this.excludedNames, option.excludedNames);
+        addAll(this.entityNames, Array.from(option.entityNames.values()));
+        addAll(this.excludedNames, Array.from(option.excludedNames.values()));
         return true;
     }
     excludeEntityName(entityName) {