generator-jhipster 8.0.0-rc.1 → 8.1.0

package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs

@@ -11,6 +11,9 @@ import EntitiesMenu from '@/entities/entities-menu.vue';
 
 import { useStore } from '@/store';
 import { useRouter } from 'vue-router';
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+import { importRemote } from '@module-federation/utilities';
+<%_ } _%>
 
 export default defineComponent({
   compatConfig: { MODE: 3 },
@@ -18,9 +21,13 @@ export default defineComponent({
   components: {
     'entities-menu': EntitiesMenu,
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-  <%_ for (const microfrontend of microfrontends) { _%>
-    '<%= microfrontend.lowercaseBaseName %>-menu': defineAsyncComponent(() => {
-      return import('@<%= microfrontend.lowercaseBaseName %>/entities-menu').catch(() => import('@/core/error/error-loading.vue'));
+  <%_ for (const remote of microfrontends) { _%>
+    '<%= remote.lowercaseBaseName %>-menu': defineAsyncComponent(() => {
+      return importRemote<any>({
+        url: `./<%= remote.endpointPrefix %>`,
+        scope: '<%= remote.lowercaseBaseName %>',
+        module: './entities-menu',
+      }).catch(() => import('@/core/error/error-loading.vue'));
     }),
   <%_ } _%>
 <%_ } _%>

package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs

@@ -177,7 +177,7 @@
     Navbar
     ========================================================================== */
   .navbar-version {
-    font-size: 10px;
+    font-size: 0.65em;
 <%_ if (clientThemeNone) { _%>
     color: #ccc;
 <%_ } _%>
@@ -243,7 +243,6 @@
 
   .navbar-title {
     display: inline-block;
-    vertical-align: middle;
 <%_ if (clientThemeNone && !clientThemeDark) { _%>
     color: white;
 <%_ } _%>
@@ -253,14 +252,14 @@
     Logo styles
     ========================================================================== */
   .navbar-brand.logo {
-    padding: 5px 15px;
+    padding: 0 7px;
   }
 
   .logo .logo-img {
     height: 45px;
     display: inline-block;
     vertical-align: middle;
-    width: 70px;
+    width: 45px;
   }
 
   .logo-img {

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

@@ -35,7 +35,6 @@
                     </dd>
 <%_ } _%>
 <%_ for (relationship of relationships) {
-    const ownerSide = relationship.ownerSide;
     const relationshipName = relationship.relationshipName;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
@@ -43,7 +42,7 @@
     const otherEntityName = relationship.otherEntityName;
     const otherEntityField = relationship.otherEntityField;
     const otherEntityAngularName = relationship.otherEntityAngularName; _%>
-  <%_ if (ownerSide) { _%>
+  <%_ if (relationship.persistableRelationship) { _%>
                     <dt>
                         <span v-text="t$('<%= i18nKeyPrefix %>.<%= relationshipName %>')"><%= relationshipNameHumanized %></span>
                     </dt>

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

@@ -34,7 +34,7 @@ import AlertService from '@/shared/alert/alert.service';
 <%_
   const allRelationshipsThatNeedSelectOptions = Object
     .values(relationshipsByOtherEntity)
-    .map(relationships => relationships.filter(rel => rel.ownerSide))
+    .map(relationships => relationships.filter(rel => rel.persistableRelationship))
     .filter(relationships => relationships.length > 0);
 _%>
 <%_ for (const [relationship] of Object.values(allRelationshipsThatNeedSelectOptions)) { _%>

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

@@ -14,9 +14,9 @@ import { useAlertService } from '@/shared/alert/alert.service';
 <%_
   const allRelationshipsThatNeedSelectOptions = Object
     .values(relationshipsByOtherEntity)
-    .map(relationships => relationships.filter(rel => rel.ownerSide))
+    .map(relationships => relationships.filter(rel => rel.persistableRelationship))
     .filter(relationships => relationships.length > 0);
-  const relationshipsContainManyToOne = relationships.some(rel => !rel.otherEntityIsEmbedded && rel.collection && rel.ownerSide);
+  const relationshipsContainManyToOne = relationships.some(rel => !rel.otherEntityIsEmbedded && rel.collection && rel.persistableRelationship);
 _%>
 
 <%_ for (const [relationship] of Object.values(allRelationshipsThatNeedSelectOptions)) { _%>
@@ -176,7 +176,7 @@ _%>
     <%_ if (relationshipsContainManyToOne) { _%>
     <%_
       for (relationship of relationships) {
-      if (relationship.relationshipType === 'many-to-many' && relationship.ownerSide === true) {
+      if (relationship.collection && relationship.persistableRelationship) {
       const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     _%>
     this.<%= entityInstance %>.<%= relationshipFieldNamePlural %> = [];

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

@@ -121,7 +121,6 @@ _%>
                     </div>
 <%_ } _%>
 <%_ for (relationship of relationships) {
-  const ownerSide = relationship.ownerSide;
   const otherEntityName = relationship.otherEntityName;
   const otherEntityNamePlural = relationship.otherEntityNamePlural;
   const relationshipName = relationship.relationshipName;
@@ -131,7 +130,7 @@ _%>
   const otherEntityField = relationship.otherEntityField;
   const relationshipRequired = relationship.relationshipRequired;
   const translationKey = `${i18nKeyPrefix}.${relationshipName}`; _%>
-  <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide && relationship.otherEntityUser)) { _%>
+  <%_ if (!relationship.collection && relationship.persistableRelationship) { _%>
                     <div class="form-group">
                         <label class="form-control-label" v-text="t$('<%= translationKey %>')" for="<%= entityFileName %>-<%= relationshipName %>"><%= relationshipNameHumanized %></label>
                         <select class="form-control" id="<%= entityFileName %>-<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" v-model="<%= entityInstance %>.<%=relationshipFieldName %>"<% if (relationshipRequired) { %> required<% } %>>
@@ -143,19 +142,7 @@ _%>
                             <option v-bind:value="<%= entityInstance %>.<%=relationshipFieldName %> && <%=otherEntityName %>Option.id === <%= entityInstance %>.<%=relationshipFieldName %>.id ? <%= entityInstance %>.<%=relationshipFieldName %> : <%=otherEntityName %>Option" v-for="<%=otherEntityName %>Option in <%=otherEntityNamePlural %>" :key="<%=otherEntityName %>Option.id">{{<%=otherEntityName %>Option.<%=otherEntityField %>}}</option>
                         </select>
                     </div>
-  <%_ } else if (relationship.relationshipOneToOne && ownerSide) { _%>
-                    <div class="form-group">
-                        <label class="form-control-label" v-text="t$('<%= translationKey %>')" for="<%= entityFileName %>-<%= relationshipName %>"><%= relationshipNameHumanized %></label>
-                        <select class="form-control" id="<%= entityFileName %>-<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" name="<%= relationshipName %>" v-model="<%= entityInstance %>.<%=relationshipFieldName %>"<% if (relationshipRequired) { %> required<% } %>>
-                            <%_ if (!relationshipRequired) { _%>
-                            <option v-bind:value="null"></option>
-                            <%_ } else { _%>
-                            <option v-if="!<%= entityInstance %>.<%= relationshipName %>" v-bind:value="null" selected></option>
-                            <%_ } _%>
-                            <option v-bind:value="<%= entityInstance %>.<%=relationshipFieldName %> && <%=otherEntityName %>Option.id === <%= entityInstance %>.<%=relationshipFieldName %>.id ? <%= entityInstance %>.<%=relationshipFieldName %> : <%=otherEntityName %>Option" v-for="<%=otherEntityName %>Option in <%=otherEntityNamePlural %>" :key="<%=otherEntityName %>Option.id">{{<%=otherEntityName %>Option.<%=otherEntityField %>}}</option>
-                        </select>
-                    </div>
-  <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
+  <%_ } else if (relationship.persistableRelationship) { _%>
                     <div class="form-group">
                         <label v-text="t$('<%= translationKey %>')" for="<%= entityFileName %>-<%= relationshipName %>"><%= relationshipNameHumanized %></label>
                         <select class="form-control" id="<%= entityFileName %>-<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipName %>" v-if="<%=entityInstance %>.<%=relationshipFieldNamePlural %> !== undefined" v-model="<%=entityInstance %>.<%=relationshipFieldNamePlural %>"<% if (relationshipRequired) { %> required<% } %>>

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

@@ -6,7 +6,7 @@ import { type I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFi
 
 const baseApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngineAny) { _%>
-const baseSearchApiUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>?query=';
+const baseSearchApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>/_search?query=';
 <%_ } _%>
 
 export default class <%= entityAngularName %>Service {

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

@@ -51,9 +51,7 @@
                     <th scope="row"<% if (!paginationNo) { %> v-on:click="changeOrder('<%= field.fieldName%>')"<% } %>><span v-text="t$('<%=`${i18nKeyPrefix}.${field.fieldName}` %>')"><%= field.fieldNameHumanized %></span><% if (!paginationNo) { %> <jhi-sort-indicator :current-order="propOrder" :reverse="reverse" :field-name="'<%= field.fieldName%>'"></jhi-sort-indicator><% } %></th>
 <%_ } _%>
 <%_ for (relationship of relationships) { _%>
-  <%_ if (relationship.relationshipManyToOne
-    || (relationship.relationshipOneToOne && relationship.ownerSide)
-    || (relationship.relationshipManyToMany && relationship.ownerSide && paginationNo)) {
+  <%_ if (relationship.persistableRelationship && (paginationNo || !relationship.collection)) {
     const fieldName = "." + relationship.otherEntityField; _%>
                     <th scope="row"<% if (!paginationNo) { %> v-on:click="changeOrder('<%=relationship.relationshipName + (fieldName)%>')"<% } %>><span v-text="t$('<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>')"><%= relationship.relationshipNameHumanized %></span><% if (!paginationNo) { %> <jhi-sort-indicator :current-order="propOrder" :reverse="reverse" :field-name="'<%=relationship.relationshipName + (fieldName)%>'"></jhi-sort-indicator><% } %></th>
   <%_ } _%>
@@ -93,15 +91,12 @@
   <%_ } _%>
 <%_ } _%>
 <%_ for (relationship of relationships) {
-    const ownerSide = relationship.ownerSide;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     const otherEntityName = relationship.otherEntityName;
     const otherEntityField = relationship.otherEntityField;
     const otherEntityAngularName = relationship.otherEntityAngularName; _%>
-    <%_ if (relationship.relationshipManyToOne
-    || (relationship.relationshipOneToOne && ownerSide)
-    || (relationship.relationshipManyToMany && ownerSide && paginationNo)) { _%>
+    <%_ if (relationship.persistableRelationship && (paginationNo || !relationship.collection)) { _%>
                     <td>
       <%_ if (relationship.otherEntityUser) { _%>
         <%_ if (relationship.relationshipManyToMany) { _%>
@@ -127,18 +122,30 @@
 <%_ } _%>
                     <td class="text-right">
                         <div class="btn-group">
+  <%_ if (authenticationTypeSession) { _%>
+                            <router-link :to="{name: '<%= entityAngularName %>View', params: {<%= entityInstance %>Id: <%= entityInstance %>.id}}" class="btn btn-info btn-sm details" data-cy="entityDetailsButton">
+  <%_ } else { _%>
                             <router-link :to="{name: '<%= entityAngularName %>View', params: {<%= entityInstance %>Id: <%= entityInstance %>.id}}" custom v-slot="{ navigate }">
                                 <button @click="navigate" class="btn btn-info btn-sm details" data-cy="entityDetailsButton">
+  <%_ } _%>
                                     <font-awesome-icon icon="eye"></font-awesome-icon>
                                     <span class="d-none d-md-inline" v-text="t$('entity.action.view')">View</span>
+  <%_ if (!authenticationTypeSession) { _%>
                                 </button>
+  <%_ } _%>
                             </router-link>
 <%_ if (!readOnly) { _%>
+  <%_ if (authenticationTypeSession) { _%>
+                            <router-link :to="{name: '<%= entityAngularName %>Edit', params: {<%= entityInstance %>Id: <%= entityInstance %>.id}}" class="btn btn-primary btn-sm edit" data-cy="entityEditButton">
+  <%_ } else { _%>
                             <router-link :to="{name: '<%= entityAngularName %>Edit', params: {<%= entityInstance %>Id: <%= entityInstance %>.id}}" custom v-slot="{ navigate }">
                                 <button @click="navigate" class="btn btn-primary btn-sm edit" data-cy="entityEditButton">
+  <%_ } _%>
                                     <font-awesome-icon icon="pencil-alt"></font-awesome-icon>
                                     <span class="d-none d-md-inline" v-text="t$('entity.action.edit')">Edit</span>
+  <%_ if (!authenticationTypeSession) { _%>
                                 </button>
+  <%_ } _%>
                             </router-link>
                             <b-button v-on:click="prepareRemove(<%= entityInstance %>)"
                                    variant="danger"

package/dist/generators/vue/templates/src/main/webapp/app/router/index.ts.ejs

@@ -1,4 +1,7 @@
 import { createRouter as createVueRouter, createWebHistory<% if (applicationTypeGateway && microfrontend) { %>, type RouteRecordRaw<% } %> } from 'vue-router';
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+import { importRemote } from '@module-federation/utilities';
+<%_ } _%>
 
 const Home = () => import('@/core/home/home.vue');
 const Error = () => import('@/core/error/error.vue');
@@ -43,7 +46,11 @@ const router = createRouter();
 <%_ if (applicationTypeGateway && microfrontend) { _%>
 export const lazyRoutes = Promise.all([
   <%_ for (const remote of microfrontends) { _%>
-  import('@<%= remote.lowercaseBaseName %>/entities-router')
+  importRemote<any>({
+    url: `./<%= remote.endpointPrefix %>`,
+    scope: '<%= remote.lowercaseBaseName %>',
+    module: './entities-router',
+  })
     .then(<%= remote.lowercaseBaseName %>Router => {
       router.addRoute(<%= remote.lowercaseBaseName %>Router.default as RouteRecordRaw);
       return <%= remote.lowercaseBaseName %>Router.default;

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

@@ -21,14 +21,19 @@
 const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <&_ } -&>
-<&_ if (fragment.moduleFederationSection) { -&>
-<%_ if (applicationTypeGateway) { _%>
-        remotes: {
-  <%_ for (const remote of microfrontends) { _%>
-          '@<%= remote.lowercaseBaseName %>': `<%= remote.lowercaseBaseName %>@/<%= remote.endpointPrefix %>/remoteEntry.js`,
-  <%_ } _%>
-        },
+
+<&_ if (fragment.configSection) { -&>
+<%_ if (applicationTypeGateway && clientFrameworkVue) { _%>
+    resolve: {
+      fallback: {
+        // Workaround https://github.com/module-federation/universe/issues/1575
+        path: false,
+      },
+    },
 <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.moduleFederationSection) { -&>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
           './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
@@ -36,35 +41,15 @@ const { DefinePlugin } = require('webpack');
         },
 <%_ } _%>
         shared: {
-          '@vuelidate/core': { singleton: true, shareScope: 'default' },
-          '@vuelidate/validators': { singleton: true, shareScope: 'default' },
-          axios: { singleton: true, shareScope: 'default' },
-          'vue-loader': { eager: true, singleton: false, shareScope: 'default' },
-          'bootstrap-vue': { singleton: true, shareScope: 'default' },
-          vue: { singleton: true, shareScope: 'default' },
-          'vue-i18n': { singleton: true, shareScope: 'default' },
-          'vue-router': { singleton: true, shareScope: 'default' },
-          pinia: { singleton: true, shareScope: 'default' },
-          '@/shared/security/authority': {
-            singleton: true,
-            shareScope: 'default',
-            import: '@/shared/security/authority',
-            requiredVersion: appVersion,
-          },
-          '@/shared/alert/alert.service': {
-            singleton: true,
-            shareScope: 'default',
-            import: '@/shared/alert/alert.service',
-            requiredVersion: appVersion,
-          },
-          '@/locale/translation.service': {
-            singleton: true,
-            shareScope: 'default',
-            import: '@/locale/translation.service',
-            requiredVersion: appVersion,
-          },
+          ...shareDependencies(),
+          ...shareMappings(
+            '@/shared/security/authority',
+            '@/shared/alert/alert.service',
+            '@/locale/translation.service',
+          ),
         },
 <&_ } -&>
+
 <&_ if (fragment.pluginsSection) { -&>
 <%_ if (applicationTypeMicroservice) { _%>
       new DefinePlugin({

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

@@ -41,6 +41,7 @@ function createJSONEntities(jdlEntities) {
             entityName,
             entityTableName: getTableNameFromEntityName(jdlEntity.tableName),
             documentation: formatComment(jdlEntity.comment),
+            annotations: jdlEntity.annotations,
         }));
     });
     return convertedEntities;

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

@@ -91,7 +91,7 @@ function getJSONOptionKeyAndValue(jdlOption) {
         case FILTER:
             return { key: 'jpaMetamodelFiltering', value: true };
         default:
-            return { key: jdlOption.name, value: jdlOption.value || true };
+            return { key: jdlOption.name, value: jdlOption.getType() === 'UNARY' ? true : jdlOption.value };
     }
 }
 function preventEntitiesFromBeingSearched(entityNames) {
@@ -101,7 +101,7 @@ function preventEntitiesFromBeingSearched(entityNames) {
 }
 function setOptionToEntityName(option, entityName) {
     const { optionName, optionValue } = option;
-    const optionContentForEntity = convertedOptionContent.get(entityName) || {};
+    const optionContentForEntity = convertedOptionContent.get(entityName) ?? {};
     optionContentForEntity[optionName] = optionValue;
     convertedOptionContent.set(entityName, optionContentForEntity);
 }

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

@@ -53,7 +53,7 @@ function getRelatedRelationships(relationships, entityNames) {
                 relationshipsRelatedToEntity.from.push(jdlRelationship);
             }
             if (jdlRelationship.to === entityName &&
-                (jdlRelationship.injectedFieldInTo || Object.keys(jdlRelationship.options.destination).length !== 0)) {
+                (jdlRelationship.injectedFieldInTo || Object.keys(jdlRelationship.options.source).length !== 0)) {
                 relationshipsRelatedToEntity.to.push(jdlRelationship);
             }
         });

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

@@ -36,7 +36,7 @@ export default {
  */
 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.");
+        throw new Error("The JDL object, the application's name, and its the database type are mandatory.");
     }
     init(args);
     setBasicEntityInformation();

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

@@ -80,7 +80,7 @@ function getJDLObjectFromMultipleApplications(directory) {
     });
     return jdlObject;
 }
-function getJDLObjectFromSingleApplication(yoRcFileContent, entities, existingJDLObject = new JDLObject()) {
+export function getJDLObjectFromSingleApplication(yoRcFileContent, entities, existingJDLObject = new JDLObject()) {
     const cleanedYoRcFileContent = cleanYoRcFileContent(yoRcFileContent);
     const jdlApplication = convertApplicationToJDL({ application: cleanedYoRcFileContent });
     if (!entities) {

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

@@ -71,6 +71,7 @@ function convertJSONToJDLEntity(entity, entityName) {
         name: entityName,
         tableName: entity.entityTableName,
         comment: entity.documentation,
+        annotations: entity.annotations,
     });
     addFields(jdlEntity, entity);
     return jdlEntity;

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

@@ -31,8 +31,7 @@ export function convertApplications(parsedApplications) {
         throw new Error('Applications have to be passed so as to be converted.');
     }
     return parsedApplications.map(parsedApplication => {
-        const formattedApplicationConfiguration = formatApplicationConfigurationOptions(parsedApplication.config);
-        const jdlApplication = createJDLApplication(formattedApplicationConfiguration);
+        const jdlApplication = createJDLApplication(parsedApplication.config, parsedApplication.namespaceConfigs);
         jdlApplication.addEntityNames(parsedApplication.entities);
         const entityOptions = getEntityOptionsInApplication(parsedApplication);
         checkEntityNamesInOptions(jdlApplication.getConfigurationOptionValue(BASE_NAME), entityOptions, parsedApplication.entities);
@@ -40,21 +39,6 @@ export function convertApplications(parsedApplications) {
         return jdlApplication;
     });
 }
-function formatApplicationConfigurationOptions(applicationConfiguration) {
-    const formattedOptions = {};
-    if (Array.isArray(applicationConfiguration.blueprints)) {
-        formattedOptions.blueprints = applicationConfiguration.blueprints.map(blueprintName => {
-            if (!/^generator-jhipster-/.test(blueprintName)) {
-                return `generator-jhipster-${blueprintName}`;
-            }
-            return blueprintName;
-        });
-    }
-    return {
-        ...applicationConfiguration,
-        ...formattedOptions,
-    };
-}
 function getEntityOptionsInApplication(parsedApplication) {
     return convertOptions(parsedApplication.options, parsedApplication.useOptions);
 }

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

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { lowerFirst } from 'lodash-es';
 import { JDLEntity } from '../../models/index.mjs';
 import { formatComment } from '../../utils/format-utils.js';
 export default { convertEntities };
@@ -34,6 +35,10 @@ export function convertEntities(parsedEntities, jdlFieldGetterFunction) {
             name: parsedEntity.name,
             tableName: parsedEntity.tableName || parsedEntity.name,
             comment: formatComment(parsedEntity.documentation),
+            annotations: Object.fromEntries(parsedEntity.annotations?.map(annotation => [
+                lowerFirst(annotation.optionName),
+                annotation.type === 'UNARY' ? true : annotation.optionValue,
+            ]) ?? []),
         });
         const jdlFields = jdlFieldGetterFunction.call(undefined, parsedEntity);
         jdlEntity.addFields(jdlFields);

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

@@ -18,7 +18,6 @@
  */
 import * as _ from 'lodash-es';
 import JDLObject from '../../models/jdl-object.js';
-import JDLUnaryOption from '../../models/jdl-unary-option.js';
 import JDLBinaryOption from '../../models/jdl-binary-option.js';
 import { applicationTypes, binaryOptions } from '../../jhipster/index.mjs';
 import { convertApplications } from './application-converter.js';
@@ -97,7 +96,6 @@ function fillClassesAndFields() {
     jdlEntities.forEach(jdlEntity => {
         jdlObject.addEntity(jdlEntity);
     });
-    addOptionsFromEntityAnnotations();
 }
 function getJDLFieldsFromParsedEntity(entity) {
     const fields = [];
@@ -110,31 +108,6 @@ function getJDLFieldsFromParsedEntity(entity) {
     }
     return fields;
 }
-function addOptionsFromEntityAnnotations() {
-    parsedContent.entities.forEach(entity => {
-        const entityName = entity.name;
-        const annotations = entity.annotations;
-        annotations.forEach(annotation => {
-            let annotationName = _.lowerFirst(annotation.optionName);
-            if (annotation.type === 'UNARY') {
-                jdlObject.addOption(new JDLUnaryOption({
-                    name: annotationName,
-                    entityNames: [entityName],
-                }));
-            }
-            else if (annotation.type === 'BINARY') {
-                if (annotationName === 'paginate') {
-                    annotationName = binaryOptions.Options.PAGINATION;
-                }
-                jdlObject.addOption(new JDLBinaryOption({
-                    name: annotationName,
-                    value: annotation.optionValue,
-                    entityNames: [entityName],
-                }));
-            }
-        });
-    });
-}
 function getValidations(field) {
     return convertValidations(field.validations, getConstantValueFromConstantName).reduce((jdlValidations, jdlValidation) => {
         jdlValidations[jdlValidation.name] = jdlValidation;

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

@@ -51,7 +51,10 @@ function setUpApplicationStructure(application) {
         [GENERATOR_NAME]: {},
     };
     applicationToExport[GENERATOR_NAME] = getApplicationConfig(application);
-    applicationToExport.entities = application.getEntityNames();
+    if (application.namespaceConfigs.length > 0) {
+        applicationToExport.namespaceConfigs = getApplicationNamespaceConfig(application);
+    }
+    applicationToExport[GENERATOR_NAME].entities = application.getEntityNames();
     if (application.hasConfigurationOption('creationTimestamp')) {
         applicationToExport[GENERATOR_NAME].creationTimestamp = parseInt(application.getConfigurationOptionValue('creationTimestamp'), 10);
     }
@@ -65,6 +68,19 @@ function getApplicationConfig(application) {
     });
     return result;
 }
+function getApplicationNamespaceConfig(application) {
+    if (application.namespaceConfigs.length === 0) {
+        return undefined;
+    }
+    const result = {};
+    application.forEachNamespaceConfiguration(configurationOption => {
+        result[configurationOption.namespace] = result[configurationOption.namespace] ?? {};
+        configurationOption.forEachOption(option => {
+            result[configurationOption.namespace][option.name] = option.getValue();
+        });
+    });
+    return result;
+}
 function cleanUpOptions(application) {
     if (!application[GENERATOR_NAME].frontEndBuilder) {
         delete application[GENERATOR_NAME].frontEndBuilder;

package/dist/jdl/exporters/config.js

@@ -0,0 +1,11 @@
+import { GENERATOR_NAME } from './export-utils.js';
+export const mergeYoRcContent = (oldConfig, newConfig) => {
+    const merged = { [GENERATOR_NAME]: {} };
+    for (const ns of new Set([...Object.keys(oldConfig), ...Object.keys(newConfig)])) {
+        merged[ns] = { ...oldConfig[ns], ...newConfig[ns] };
+    }
+    if (oldConfig[GENERATOR_NAME]?.creationTimestamp) {
+        merged[GENERATOR_NAME].creationTimestamp = oldConfig[GENERATOR_NAME].creationTimestamp;
+    }
+    return merged;
+};

package/dist/jdl/exporters/export-utils.js

@@ -18,6 +18,7 @@
  */
 import fs from 'fs';
 import { doesFileExist } from '../utils/file-utils.js';
+import { mergeYoRcContent } from './config.js';
 export const GENERATOR_NAME = 'generator-jhipster';
 /**
  * This function writes a Yeoman config file in the current folder.
@@ -28,19 +29,7 @@ export function writeConfigFile(config, yoRcPath = '.yo-rc.json') {
     let newYoRc = { ...config };
     if (doesFileExist(yoRcPath)) {
         const yoRc = JSON.parse(fs.readFileSync(yoRcPath, { encoding: 'utf-8' }));
-        let creationTimestamp = config[GENERATOR_NAME].creationTimestamp;
-        if (yoRc[GENERATOR_NAME] && yoRc[GENERATOR_NAME].creationTimestamp) {
-            creationTimestamp = yoRc[GENERATOR_NAME].creationTimestamp;
-        }
-        newYoRc = {
-            ...yoRc,
-            ...config,
-            [GENERATOR_NAME]: {
-                ...yoRc[GENERATOR_NAME],
-                ...config[GENERATOR_NAME],
-                creationTimestamp,
-            },
-        };
+        newYoRc = mergeYoRcContent(yoRc, config);
     }
     fs.writeFileSync(yoRcPath, JSON.stringify(newYoRc, null, 2).concat('\n'));
 }

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

@@ -63,8 +63,9 @@ function updateEntities(subFolder) {
 function updateEntityToGenerateWithExistingOne(filePath, entity) {
     if (doesFileExist(filePath)) {
         const fileOnDisk = readJSONFile(filePath);
-        if (fileOnDisk && fileOnDisk.changelogDate) {
-            entity.changelogDate = fileOnDisk.changelogDate;
+        if (!entity.annotations?.changelogDate && fileOnDisk?.annotations?.changelogDate) {
+            entity.annotations = entity.annotations || {};
+            entity.annotations.changelogDate = fileOnDisk.annotations.changelogDate;
             return { ...fileOnDisk, ...entity };
         }
     }

package/dist/jdl/index.js

@@ -1,3 +1,4 @@
 export * from './jdl-importer.js';
 export * from './parsing/api.js';
 export * from './jhipster/index.mjs';
+export * from './exporters/config.js';

package/dist/jdl/jdl-importer.js

@@ -204,8 +204,10 @@ function importOneApplicationAndEntities(jdlObject, configuration) {
         jdlObject,
     });
     const jsonEntities = entitiesPerApplicationMap.get(applicationName);
+    const { 'generator-jhipster': config, ...remaining } = formattedApplication;
     importState.exportedApplicationsWithEntities[applicationName] = {
-        config: formattedApplication['generator-jhipster'],
+        config,
+        ...remaining,
         entities: [],
     };
     if (jsonEntities.length !== 0) {
@@ -239,8 +241,10 @@ function importApplicationsAndEntities(jdlObject, configuration) {
             forSeveralApplications: true,
         });
         const exportedConfig = importState.exportedApplications.find(config => applicationName === config['generator-jhipster'].baseName);
+        const { 'generator-jhipster': config, ...remaining } = exportedConfig;
         importState.exportedApplicationsWithEntities[applicationName] = {
-            config: exportedConfig['generator-jhipster'],
+            config,
+            ...remaining,
             entities: exportedJSONEntities,
         };
         importState.exportedEntities = uniqBy([...importState.exportedEntities, ...exportedJSONEntities], 'name');

package/dist/jdl/jhipster/default-application-options.js

@@ -121,7 +121,7 @@ export function getConfigForTranslation(options = {}) {
         options[NATIVE_LANGUAGE] = 'en';
     }
     if (options[ENABLE_TRANSLATION] && options[LANGUAGES] === undefined) {
-        options[LANGUAGES] = ['en', 'fr'];
+        options[LANGUAGES] = [];
     }
     return options;
 }

package/dist/jdl/jhipster/field-types.js

@@ -40,7 +40,7 @@ export const CommonDBTypes = {
     TEXT_BLOB: 'TextBlob',
     INSTANT: 'Instant',
     DURATION: 'Duration',
-    BYTES: 'byte[]',
+    BYTES: 'byte[]', // Supported by mongodb at CI samples
     BYTE_BUFFER: 'ByteBuffer', // Supported by cassandra at CI samples
 };
 export const RelationalOnlyDBTypes = {