generator-jhipster 8.0.0 → 8.1.0

package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs

@@ -69,7 +69,7 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
                     }
                 }
 <%_ if (reactive) { _%>
-                testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
+                testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMariadb) { %>.replace("mariadb", "mysql")<% } else if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
                 testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
                 testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
                 testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- prodDatabaseExtraOptions %>");

package/dist/generators/upgrade/generator.mjs

@@ -152,11 +152,11 @@ export default class UpgradeGenerator extends BaseGenerator {
         const noPackageLockParam = '--no-package-lock';
         const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts --force`;
         this.log.verboseInfo(generatorCommand);
-        const npmIntall = this.spawnCommandSync(generatorCommand, { stdio: 'pipe', reject: false });
-        if (npmIntall.exitCode === 0)
+        const npmInstall = this.spawnCommandSync(generatorCommand, { stdio: 'pipe', reject: false });
+        if (npmInstall.exitCode === 0)
             this.log.ok(`Installed ${npmPackage}@${version}`);
         else
-            throw new Error(`Something went wrong while installing ${npmPackage}! ${npmIntall.stdout} ${npmIntall.stderr}`);
+            throw new Error(`Something went wrong while installing ${npmPackage}! ${npmInstall.stdout} ${npmInstall.stderr}`);
     }
     get [BaseGenerator.CONFIGURING]() {
         return this.asConfiguringTaskGroup({

package/dist/generators/vue/resources/package.json

@@ -1,33 +1,33 @@
 {
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.4.2",
-    "@fortawesome/free-solid-svg-icons": "6.4.2",
-    "@fortawesome/vue-fontawesome": "3.0.3",
+    "@fortawesome/fontawesome-svg-core": "6.5.1",
+    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@fortawesome/vue-fontawesome": "3.0.5",
     "@vuelidate/core": "2.0.3",
     "@vuelidate/validators": "2.0.4",
-    "@vueuse/core": "10.5.0",
-    "axios": "1.6.0",
+    "@vueuse/core": "10.7.0",
+    "axios": "1.6.2",
     "bootstrap": "4.6.2",
     "bootstrap-vue": "2.23.1",
     "bootswatch": "5.3.2",
     "deepmerge": "4.3.1",
     "js-cookie": "3.0.5",
     "pinia": "2.1.7",
-    "vue": "3.3.7",
-    "vue-i18n": "9.6.2",
+    "vue": "3.3.11",
+    "vue-i18n": "9.8.0",
     "vue-router": "4.2.5"
   },
   "devDependencies": {
     "@module-federation/utilities": "3.0.3-0",
     "@pinia/testing": "0.1.3",
-    "@rushstack/eslint-patch": "1.5.1",
+    "@rushstack/eslint-patch": "1.6.0",
     "@tsconfig/node18": "18.2.2",
-    "@types/node": "18.18.8",
-    "@types/sinon": "10.0.20",
-    "@vitejs/plugin-vue": "4.4.0",
+    "@types/node": "18.19.3",
+    "@types/sinon": "17.0.2",
+    "@vitejs/plugin-vue": "4.5.2",
     "@vue/eslint-config-prettier": "8.0.0",
     "@vue/eslint-config-typescript": "10.0.0",
-    "@vue/test-utils": "2.4.1",
+    "@vue/test-utils": "2.4.3",
     "@vue/tsconfig": "0.4.0",
     "autoprefixer": "10.4.16",
     "axios-mock-adapter": "1.22.0",
@@ -35,13 +35,13 @@
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.52.0",
+    "eslint": "8.55.0",
     "eslint-plugin-prettier": "5.0.1",
     "eslint-plugin-vue": "8.7.1",
     "flush-promises": "1.0.2",
     "folder-hash": "4.0.4",
     "happy-dom": "12.10.3",
-    "html-webpack-plugin": "5.5.3",
+    "html-webpack-plugin": "5.5.4",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.7.6",
     "numeral": "2.0.6",
@@ -54,16 +54,16 @@
     "sass-loader": "13.3.2",
     "sinon": "17.0.1",
     "terser-webpack-plugin": "5.3.9",
-    "ts-loader": "9.5.0",
-    "typescript": "5.2.2",
-    "vite": "4.5.0",
-    "vitest": "0.34.6",
-    "vitest-sonar-reporter": "0.5.0",
+    "ts-loader": "9.5.1",
+    "typescript": "5.3.3",
+    "vite": "5.0.7",
+    "vitest": "1.0.4",
+    "vitest-sonar-reporter": "1.0.0",
     "vue-loader": "17.3.1",
     "vue-style-loader": "4.1.3",
-    "vue-tsc": "1.8.22",
+    "vue-tsc": "1.8.25",
     "webpack": "5.89.0",
-    "webpack-bundle-analyzer": "4.9.1",
+    "webpack-bundle-analyzer": "4.10.1",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.10.0",

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

@@ -156,6 +156,7 @@
 <%_ } else { %>
     "webapp:build:dev": "<%= clientPackageManager %> run vite-build",
     "webapp:build:prod": "<%= clientPackageManager %> run vite-build",
+    "webapp:dev": "<%= clientPackageManager %> run vite-serve",
     "webapp:serve": "<%= clientPackageManager %> run vite-serve",
 <%_ } %>
     "webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod --",

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_.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) { _%>

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/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/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/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/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 = {

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

@@ -22,6 +22,7 @@ import { upperFirst } from '../utils/string-utils.js';
  * The JSONEntity class represents a read-to-be exported to JSON entity.
  */
 class JSONEntity {
+    annotations;
     /**
      * Creates a new JSONEntity instance.
      * @param args the entity configuration, keys:
@@ -46,6 +47,7 @@ class JSONEntity {
         const merged = merge(getDefaults(args.entityName), args);
         this.name = merged.name;
         this.fields = merged.fields;
+        this.annotations = merged.annotations;
         this.relationships = merged.relationships;
         this.documentation = merged.documentation;
         this.entityTableName = merged.entityTableName;
@@ -100,6 +102,9 @@ class JSONEntity {
             this[optionName] = options[optionName];
         });
     }
+    setAnnotations(annotations = {}) {
+        Object.assign(this.annotations, annotations);
+    }
 }
 export default JSONEntity;
 function getDefaults(entityName) {
@@ -108,5 +113,6 @@ function getDefaults(entityName) {
         fields: [],
         relationships: [],
         applications: [],
+        annotations: {},
     };
 }

package/dist/jdl/models/jdl-entity.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { upperFirst } from 'lodash-es';
 import { merge } from '../utils/object-utils.js';
 import getTableNameFromEntityName from '../jhipster/entity-table-name-creator.js';
 export default class JDLEntity {
@@ -23,6 +24,7 @@ export default class JDLEntity {
     tableName;
     fields;
     comment;
+    annotations;
     constructor(args) {
         const merged = merge(defaults(), args);
         if (!merged.name) {
@@ -32,6 +34,7 @@ export default class JDLEntity {
         this.tableName = merged.tableName || merged.name;
         this.fields = merged.fields;
         this.comment = merged.comment;
+        this.annotations = merged.annotations ?? {};
     }
     /**
      * Adds the fields to the entity.
@@ -60,6 +63,18 @@ export default class JDLEntity {
                 .map(line => ` * ${line}\n`)
                 .join('')} */\n`;
         }
+        Object.entries(this.annotations).forEach(([key, value]) => {
+            key = upperFirst(key);
+            if (value === true) {
+                stringifiedEntity += `@${key}\n`;
+            }
+            else if (typeof value === 'string') {
+                stringifiedEntity += `@${key}("${value}")\n`;
+            }
+            else {
+                stringifiedEntity += `@${key}(${value})\n`;
+            }
+        });
         stringifiedEntity += `entity ${this.name}`;
         if (this.tableName && getTableNameFromEntityName(this.name) !== getTableNameFromEntityName(this.tableName)) {
             stringifiedEntity += ` (${this.tableName})`;
@@ -73,7 +88,7 @@ export default class JDLEntity {
 function defaults() {
     return {
         fields: {},
-        options: [],
+        annotations: {},
     };
 }
 function formatFieldObjects(jdlFieldObjects) {

package/dist/jdl/models/jdl-field.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { upperFirst } from 'lodash-es';
 import { merge } from '../utils/object-utils.js';
 export default class JDLField {
     name;
@@ -66,6 +67,18 @@ export default class JDLField {
                 .map(line => ` * ${line}\n`)
                 .join('')} */\n`;
         }
+        Object.entries(this.options ?? {}).forEach(([key, value]) => {
+            key = upperFirst(key);
+            if (value === true) {
+                string += `@${key}\n`;
+            }
+            else if (typeof value === 'string') {
+                string += `@${key}("${value}")\n`;
+            }
+            else {
+                string += `@${key}(${value})\n`;
+            }
+        });
         string += `${this.name} ${this.type}`;
         Object.keys(this.validations).forEach(validationName => {
             string += ` ${this.validations[validationName].toString()}`;

package/dist/jdl/models/jdl-object.js

@@ -229,10 +229,10 @@ export default class JDLObject {
             string += `${this.enums.toString()}\n`;
         }
         if (this.getRelationshipQuantity() !== 0) {
-            string += `${relationshipsToString(this.relationships)}\n`;
+            string += `${relationshipsToString(this.relationships)}`;
         }
         if (this.getOptionQuantity() !== 0) {
-            string += `${optionsToString(this.options)}`;
+            string += `\n${optionsToString(this.options)}`;
         }
         return string;
     }
@@ -263,7 +263,7 @@ function relationshipsToString(relationships) {
     if (string === '') {
         return '';
     }
-    return `${relationships.toString()}\n`;
+    return `${string}\n`;
 }
 function optionsToString(options) {
     const string = options.toString();

package/dist/jdl/models/jdl-relationship.js

@@ -1,3 +1,22 @@
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { upperFirst } from 'lodash-es';
 import { Validations } from '../jhipster/index.mjs';
 import { relationshipTypeExists } from '../jhipster/relationship-types.js';
 const { REQUIRED } = Validations;
@@ -72,9 +91,9 @@ export default class JDLRelationship {
         if (Object.keys(sourceOptions).length !== 0) {
             Object.keys(sourceOptions).forEach(name => {
                 const value = sourceOptions[name];
-                string += `  @${name}${value != null && sourceOptions[name] !== true ? `(${value})` : ''}\n`;
+                name = upperFirst(name);
+                string += `@${name}${value != null && value !== true ? `(${value}) ` : ' '}`;
             });
-            string += '  ';
         }
         string += `${this.from}`;
         if (this.injectedFieldInFrom) {
@@ -92,12 +111,11 @@ export default class JDLRelationship {
         }
         const destinationOptions = this.options.destination;
         if (Object.keys(destinationOptions).length !== 0) {
-            string += '\n';
             Object.keys(destinationOptions).forEach(name => {
                 const value = destinationOptions[name];
-                string += `  @${name}${value != null && destinationOptions[name] !== true ? `(${value})` : ''}\n`;
+                name = upperFirst(name);
+                string += `@${name}${value != null && value !== true ? `(${value}) ` : ' '}`;
             });
-            string += '  ';
         }
         string += `${this.to}`;
         if (this.injectedFieldInTo) {

package/dist/jdl/parsing/lexer/application-tokens.js

@@ -55,7 +55,7 @@ const applicationConfigTokens = [
     { name: 'CLIENT_THEME', pattern: CLIENT_THEME },
     { name: 'WITH_ADMIN_UI', pattern: WITH_ADMIN_UI },
     { name: 'NATIVE_LANGUAGE', pattern: NATIVE_LANGUAGE },
-    { name: 'FRONT_END_BUILDER', pattern: 'frontendBuilder' },
+    { name: 'FRONT_END_BUILDER', pattern: 'frontendBuilder' }, // TODO always valid?
     { name: 'SKIP_USER_MANAGEMENT', pattern: SKIP_USER_MANAGEMENT },
     { name: 'ENABLE_SWAGGER_CODEGEN', pattern: ENABLE_SWAGGER_CODEGEN },
     { name: 'REACTIVE', pattern: REACTIVE },

package/dist/testing/helpers.mjs

@@ -5,7 +5,7 @@ import EnvironmentBuilder from '../cli/environment-builder.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generators/generator-constants.mjs';
 import { GENERATOR_WORKSPACES } from '../generators/generator-list.mjs';
 import getGenerator from './get-generator.mjs';
-import { createJHipsterLogger, normalizePathEnd } from '../generators/base/support/index.mjs';
+import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from '../generators/base/support/index.mjs';
 import BaseGenerator from '../generators/base/index.mjs';
 import { getPackageRoot, isDistFolder } from '../lib/index.mjs';
 const { set } = _;
@@ -76,7 +76,7 @@ class JHipsterRunContext extends RunContext {
     commonWorkspacesConfig;
     generateApplicationsSet = false;
     withJHipsterConfig(configuration, entities) {
-        return this.withFiles(createFiles('', { baseName: 'jhipster', ...configuration }, entities));
+        return this.withFiles(createFiles('', { baseName: 'jhipster', creationTimestamp: parseCreationTimestamp('2020-01-01'), ...configuration }, entities));
     }
     withSkipWritingPriorities() {
         return this.withOptions({ skipPriorities: ['writing', 'postWriting', 'writingEntities', 'postWritingEntities'] });
@@ -261,7 +261,14 @@ export function createTestHelpers(options = {}) {
     helper.getRunContextType = () => JHipsterRunContext;
     return helper;
 }
-const commonTestOptions = { reproducible: true, skipChecks: true, reproducibleTests: true, noInsight: true };
+const commonTestOptions = {
+    reproducible: true,
+    skipChecks: true,
+    reproducibleTests: true,
+    noInsight: true,
+    useVersionPlaceholders: true,
+    fakeKeytool: true,
+};
 export const basicHelpers = createTestHelpers({ generatorOptions: { ...commonTestOptions } });
 export const defaultHelpers = createTestHelpers({
     generatorOptions: { skipPrettier: true, ...commonTestOptions },

package/dist/types/cli/environment-builder.d.mts

@@ -35,6 +35,8 @@ export default class EnvironmentBuilder {
      */
     constructor(env: any);
     devBlueprintPath: any;
+    localBlueprintPath: any;
+    localBlueprintExists: any;
     env: any;
     prepare({ blueprints, lookups, devBlueprintPath }?: {
         blueprints: any;

package/dist/types/generators/angular/needle-api/needle-client-angular.d.mts

@@ -3,7 +3,6 @@ export default class extends needleClientBase {
     addGlobalSCSSStyle(style: any, comment: any): void;
     addVendorSCSSStyle(style: any, comment: any): void;
     addModule(appName: any, angularName: any, folderName: any, fileName: any, enableTranslation: any): void;
-    addToAdminModule(appName: any, adminAngularName: any, adminFolderName: any, adminFileName: any, enableTranslation: any): void;
     _genericAddModule(appName: any, angularName: any, folderName: any, fileName: any, enableTranslation: any, clientFramework: any, modulePath: any, importNeedle: any, moduleNeedle: any): void;
     _generateRewriteFileModelWithImportStatement(appName: any, angularName: any, folderName: any, fileName: any, modulePath: any, needle: any): import("../../needle-base.mjs").NeedleFileModel;
     _generateImportStatement(appName: any, angularName: any, folderName: any, fileName: any): string;