generator-jhipster 8.3.0 → 8.5.0

package/dist/generators/vue/templates/src/main/webapp/app/admin/tracker/tracker.service.spec.ts.ejs

@@ -91,7 +91,7 @@ describe('Tracker Service', () => {
 
     // THEN
     expect(mockStomp.publish).toBeCalledTimes(1);
-    expect(mockStomp.publish).toBeCalledWith({ destination: '/topic/activity', body: JSON.stringify({ page: '/admin' }) });
+    expect(mockStomp.publish).toHaveBeenCalledWith({ destination: '/topic/activity', body: JSON.stringify({ page: '/admin' }) });
   });
 
   it('Should disconnect on logout', async () => {

package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs

@@ -1,7 +1,7 @@
 <template>
   <div class="row justify-content-center">
     <div class="col-8">
-      <form name="editForm" role="form" novalidate v-on:submit.prevent="save()" v-if="userAccount">
+      <form name="editForm" novalidate v-on:submit.prevent="save()" v-if="userAccount">
         <h2 id="myUserLabel" v-text="t$('userManagement.home.createOrEditLabel')">
           Create or edit a User
         </h2>

package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs

@@ -4,7 +4,7 @@
       <span class="hipster img-fluid rounded"></span>
     </div>
     <div class="col-md-9">
-      <h1 class="display-4" v-text="t$('home.title')">Welcome, <%= backendType %> Hipster!</h1>
+      <h1 class="display-4" v-text="t$('home.title')">Welcome, <%- hipsterName %>!</h1>
       <p class="lead" v-text="t$('home.subtitle')">This is your homepage</p>
 
       <div>
@@ -33,29 +33,29 @@
       </p>
 
       <ul>
-        <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer"
+        <li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer"
             v-text="t$('home.link.homepage')">JHipster homepage</a></li>
         <li>
-          <a href="http://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer"
+          <a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer"
             v-text="t$('home.link.stackoverflow')">JHipster on Stack Overflow</a>
         </li>
         <li>
-          <a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer"
+          <a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer"
             v-text="t$('home.link.bugtracker')">JHipster bug tracker</a>
         </li>
         <li>
-          <a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer"
+          <a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer"
             v-text="t$('home.link.chat')">JHipster public chat room</a>
         </li>
         <li>
-          <a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer" v-text="t$('home.link.follow')">follow
+          <a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer" v-text="t$('home.link.follow')">follow
             @jhipster on Twitter</a>
         </li>
       </ul>
 
       <p>
         <span v-text="t$('home.like')">If you like JHipster, don't forget to give us a star on</span>
-        <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer"
+        <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer"
           v-text="t$('home.github')">GitHub</a>!
       </p>
     </div>

package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs

@@ -34,7 +34,7 @@
   <%_ } _%>
                     </dd>
 <%_ } _%>
-<%_ for (relationship of relationships) {
+<%_ for (relationship of relationships.filter(rel => !rel.otherEntity.embedded)) {
     const relationshipName = relationship.relationshipName;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;

package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs

@@ -1,7 +1,7 @@
 <template>
     <div class="row justify-content-center">
         <div class="col-8">
-            <form name="editForm" role="form" novalidate v-on:submit.prevent="save()" >
+            <form name="editForm" novalidate v-on:submit.prevent="save()" >
                 <h2 id="<%= i18nKeyPrefix %>.home.createOrEditLabel" data-cy="<%= entityClass %>CreateUpdateHeading" v-text="t$('<%= i18nKeyPrefix %>.home.createOrEditLabel')">Create or edit a <%= entityAngularName %></h2>
                 <div>
                     <div class="form-group" v-if="<%= entityInstance %>.<%= primaryKey.name %>">
@@ -120,7 +120,7 @@ _%>
   <%_ } _%>
                     </div>
 <%_ } _%>
-<%_ for (relationship of relationships) {
+<%_ for (relationship of relationships.filter(rel => !rel.otherEntity.embedded)) {
   const otherEntityName = relationship.otherEntityName;
   const otherEntityNamePlural = relationship.otherEntityNamePlural;
   const relationshipName = relationship.relationshipName;

package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs

@@ -90,7 +90,7 @@
                     <td>{{<%=entityInstance %>.<%=fieldName%>}}</td>
   <%_ } _%>
 <%_ } _%>
-<%_ for (relationship of relationships) {
+<%_ for (relationship of relationships.filter(rel => !rel.otherEntity.embedded)) {
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     const otherEntityName = relationship.otherEntityName;

package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.spec.ts.ejs

@@ -31,7 +31,7 @@ describe('Alert Service test suite', () => {
 
     // THEN
     expect(toastStub).toBeCalledTimes(1);
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',
@@ -62,7 +62,7 @@ describe('Alert Service test suite', () => {
     expect(translationStub).toHaveBeenCalledWith(translationKey);
 <%_ } _%>
     expect(toastStub).toBeCalledTimes(1);
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',
@@ -102,10 +102,10 @@ describe('Alert Service test suite', () => {
     // THEN
 <%_ if (enableTranslation) { _%>
     expect(translationStub).toBeCalledTimes(2);
-    expect(translationStub).toBeCalledWith(translationKey, { entityName: 'DummyEntity' });
-    expect(translationStub).toBeCalledWith('global.menu.entities.dummyEntity');
+    expect(translationStub).toHaveBeenCalledWith(translationKey, { entityName: 'DummyEntity' });
+    expect(translationStub).toHaveBeenCalledWith('global.menu.entities.dummyEntity');
 <%_ } _%>
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',
@@ -144,7 +144,7 @@ describe('Alert Service test suite', () => {
     expect(translationStub).toHaveBeenCalledWith(message);
 <%_ } _%>
     expect(toastStub).toBeCalledTimes(1);
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',
@@ -176,7 +176,7 @@ describe('Alert Service test suite', () => {
     expect(translationStub).toHaveBeenCalledWith(translationKey);
 <%_ } _%>
     expect(toastStub).toBeCalledTimes(1);
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',
@@ -208,7 +208,7 @@ describe('Alert Service test suite', () => {
     expect(translationStub).toHaveBeenCalledWith(message);
 <%_ } _%>
     expect(toastStub).toBeCalledTimes(1);
-    expect(toastStub).toBeCalledWith(message, {
+    expect(toastStub).toHaveBeenCalledWith(message, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
       variant: 'danger',

package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.spec.ts.ejs

@@ -43,7 +43,7 @@ describe('Formatter i18n', () => {
 
     dataUtilsService.openFile('text', 'data');
 
-    expect(window.open).toBeCalledWith(objectURL);
+    expect(window.open).toHaveBeenCalledWith(objectURL);
   });
 
   it('should check text ends with suffix', () => {

package/dist/generators/vue/templates/tsconfig.app.json.ejs

@@ -7,7 +7,7 @@
     "baseUrl": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>app",
     "outDir": "<%= this.relativeDir(clientRootDir, temporaryDir) %>out-tsc/dist",
     "paths": {
-      "@/*": ["./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
+      "@/*": ["./*"]
     }
   }
 }

package/dist/generators/vue/templates/vite.config.mts.ejs

@@ -18,6 +18,7 @@
 -%>
 import { fileURLToPath, URL } from 'node:url';
 import { existsSync } from 'node:fs';
+import { normalizePath } from 'vite'
 
 import {
 <%_ if (microfrontend) { _%>
@@ -49,10 +50,10 @@ let config = defineConfig({
       targets: [
         {
           src: [
-            `${swaggerUiPath}/*.{js,css,html,png}`,
-            `!${swaggerUiPath}/**/index.html`,
-            getFileFromRepo('axios/dist/axios.min.js'),
-            fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url)),
+            `${normalizePath(swaggerUiPath)}/*.{js,css,html,png}`,
+            `!${normalizePath(swaggerUiPath)}/**/index.html`,
+            normalizePath(getFileFromRepo('axios/dist/axios.min.js')),
+            normalizePath(fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url))),
           ],
           dest: 'swagger-ui',
         },

package/dist/generators/vue/templates/vitest.config.mts.ejs

@@ -48,7 +48,7 @@ export default mergeConfig(
         statements: 85,
         branches: 75,
         lines: 85,
-        reportsDirectory: fileURLToPath(new URL('./target/vite-coverage', import.meta.url)),
+        reportsDirectory: fileURLToPath(new URL('./<%= this.relativeDir(clientRootDir, temporaryDir) %>vite-coverage', import.meta.url)),
       },
     },
   }),

package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs

@@ -49,12 +49,3 @@ const { DefinePlugin } = require('webpack');
           ),
         },
 <&_ } -&>
-
-<&_ if (fragment.pluginsSection) { -&>
-<%_ if (applicationTypeMicroservice) { _%>
-      new DefinePlugin({
-        <%= this._.upperCase(baseName) %>_I18N_RESOURCES_PREFIX: JSON.stringify(''),
-      }),
-<%_ } _%>
-<&_ } -&>
-

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;
     }, []);