generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/base-application/command.mjs

@@ -0,0 +1,10 @@
+const command = {
+    options: {
+        baseName: {
+            description: 'Application base name',
+            type: String,
+            scope: 'storage',
+        },
+    },
+};
+export default command;

package/dist/generators/base-application/generator.mjs

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import { upperFirst } from 'lodash-es';
 import BaseGenerator from '../base/index.mjs';
 import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
 import { getEntitiesFromDir } from './support/index.mjs';
-const { upperFirst } = _;
-const { LOADING, PREPARING, CONFIGURING_EACH_ENTITY, LOADING_ENTITIES, PREPARING_EACH_ENTITY, PREPARING_EACH_ENTITY_FIELD, PREPARING_EACH_ENTITY_RELATIONSHIP, POST_PREPARING_EACH_ENTITY, DEFAULT, WRITING, POST_WRITING, WRITING_ENTITIES, POST_WRITING_ENTITIES, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
+import command from './command.mjs';
+import { mutateApplication } from '../base/support/config.mjs';
+const { LOADING, PREPARING, POST_PREPARING, CONFIGURING_EACH_ENTITY, LOADING_ENTITIES, PREPARING_EACH_ENTITY, PREPARING_EACH_ENTITY_FIELD, PREPARING_EACH_ENTITY_RELATIONSHIP, POST_PREPARING_EACH_ENTITY, DEFAULT, WRITING, POST_WRITING, WRITING_ENTITIES, POST_WRITING_ENTITIES, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
 const { CONFIGURING_EACH_ENTITY_QUEUE, LOADING_ENTITIES_QUEUE, PREPARING_EACH_ENTITY_QUEUE, PREPARING_EACH_ENTITY_FIELD_QUEUE, PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE, POST_PREPARING_EACH_ENTITY_QUEUE, WRITING_ENTITIES_QUEUE, POST_WRITING_ENTITIES_QUEUE, } = QUEUES;
 const asPriority = BaseGenerator.asPriority;
 /**
@@ -42,6 +43,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         if (this.options.help) {
             return;
         }
+        this.parseJHipsterOptions(command.options);
         this.registerPriorities(CUSTOM_PRIORITIES);
         /* Add tasks allowing entities priorities to match normal priorities pattern */
         this.on('queueOwnTasks', () => {
@@ -56,8 +58,8 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             });
             if (this.options.applicationWithEntities.entities) {
                 const entities = this.options.applicationWithEntities.entities.map(entity => {
-                    const entityName = _.upperFirst(entity.name);
-                    const file = this.destinationPath(JHIPSTER_CONFIG_DIR, `${entityName}.json`);
+                    const entityName = upperFirst(entity.name);
+                    const file = this.getEntityConfigPath(entityName);
                     this.fs.writeJSON(file, { ...this.fs.readJSON(file), ...entity });
                     return entityName;
                 });
@@ -66,13 +68,20 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             delete this.options.applicationWithEntities;
         }
     }
+    /**
+     * Get Entities configuration path
+     * @returns
+     */
+    getEntitiesConfigPath(...args) {
+        return this.destinationPath(JHIPSTER_CONFIG_DIR, ...args);
+    }
     /**
      * Get Entity configuration path
      * @param entityName Entity name
      * @returns
      */
     getEntityConfigPath(entityName) {
-        return this.destinationPath(JHIPSTER_CONFIG_DIR, `${upperFirst(entityName)}.json`);
+        return this.getEntitiesConfigPath(`${upperFirst(entityName)}.json`);
     }
     /**
      * Get all the generator configuration from the .yo-rc.json file
@@ -98,7 +107,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         function isBefore(e1, e2) {
             return e1.definition.changelogDate - e2.definition.changelogDate;
         }
-        const configDir = this.destinationPath(JHIPSTER_CONFIG_DIR);
+        const configDir = this.getEntitiesConfigPath();
         const entities = [];
         for (const entityName of [...new Set((this.jhipsterConfig.entities || []).concat(getEntitiesFromDir(configDir)))]) {
             const definition = this.getEntityConfig(entityName)?.getAll();
@@ -219,12 +228,13 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         return [firstArg];
     }
     /**
-     * @private
+     * @protected
      */
     getTaskFirstArgForPriority(priorityName) {
         if (![
             LOADING,
             PREPARING,
+            POST_PREPARING,
             CONFIGURING_EACH_ENTITY,
             LOADING_ENTITIES,
             PREPARING_EACH_ENTITY,
@@ -246,6 +256,12 @@ export default class BaseApplicationGenerator extends BaseGenerator {
             throw new Error(`BaseName (${this.jhipsterConfig.baseName}) application not available for priority ${priorityName}`);
         }
         const application = this.sharedData.getApplication();
+        if ([PREPARING, LOADING].includes(priorityName)) {
+            return {
+                application,
+                applicationDefaults: data => mutateApplication(application, data),
+            };
+        }
         if (LOADING_ENTITIES === priorityName) {
             return {
                 application,
@@ -276,7 +292,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
     /**
      * @private
      * Get entities to configure.
-     * This method doesn't filter entities. An filtered config can be changed at thie priority.
+     * This method doesn't filter entities. An filtered config can be changed at this priority.
      * @returns {string[]}
      */
     getEntitiesDataToConfigure() {

package/dist/generators/base-application/priorities.mjs

@@ -34,6 +34,8 @@ const WRITING_ENTITIES = 'writingEntities';
 const WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${WRITING_ENTITIES}`;
 const POST_WRITING_ENTITIES = 'postWritingEntities';
 const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
+const LOADING_TRANSLATIONS = 'loadingTranslations';
+const LOADING_TRANSLATIONS_QUEUE = `${QUEUE_PREFIX}${LOADING_TRANSLATIONS}`;
 export const CUSTOM_PRIORITIES = [
     {
         priorityName: CONFIGURING_EACH_ENTITY,
@@ -80,6 +82,12 @@ export const CUSTOM_PRIORITIES = [
     {
         priorityName: POST_WRITING_ENTITIES,
         queueName: POST_WRITING_ENTITIES_QUEUE,
+        before: LOADING_TRANSLATIONS,
+        skip: true,
+    },
+    {
+        priorityName: LOADING_TRANSLATIONS,
+        queueName: LOADING_TRANSLATIONS_QUEUE,
         before: TRANSFORM,
         skip: true,
     },
@@ -93,6 +101,7 @@ const ENTITY_QUEUES = {
     POST_PREPARING_EACH_ENTITY_QUEUE,
     WRITING_ENTITIES_QUEUE,
     POST_WRITING_ENTITIES_QUEUE,
+    LOADING_TRANSLATIONS_QUEUE,
 };
 export const ENTITY_PRIORITY_NAMES = {
     CONFIGURING_EACH_ENTITY,
@@ -130,6 +139,7 @@ export const PRIORITY_NAMES_LIST = [
     WRITING_ENTITIES,
     PRIORITY_NAMES.POST_WRITING,
     POST_WRITING_ENTITIES,
+    LOADING_TRANSLATIONS,
     PRIORITY_NAMES_BASE.INSTALL,
     PRIORITY_NAMES_BASE.POST_INSTALL,
     PRIORITY_NAMES_BASE.END,

package/dist/generators/base-application/support/entity.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 const { upperFirst } = _;
 // eslint-disable-next-line import/prefer-default-export
 export const findEntityInEntities = (entityName, entities) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName));

package/dist/generators/base-application/support/enum.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { formatDocAsJavaDoc } from '../../server/support/doc.mjs';
 const doesTheEnumValueHaveACustomValue = enumValue => {
     return enumValue.includes('(');
@@ -85,7 +85,7 @@ export const getEnumInfo = (field, clientRootFolder) => {
     const customValuesState = getCustomValuesState(enums);
     return {
         enumName: field.fieldType,
-        javadoc: field.fieldTypeJavadoc && formatDocAsJavaDoc(field.fieldTypeJavadoc),
+        javadoc: field.fieldTypeDocumentation && formatDocAsJavaDoc(field.fieldTypeDocumentation),
         enumInstance: field.enumInstance,
         enums,
         ...customValuesState,

package/dist/generators/base-application/support/prepare-entity.mjs

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.mjs';
-import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase } from '../../base/support/index.mjs';
+import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName } from '../../base/support/index.mjs';
 import { fieldToReference } from './prepare-field.mjs';
 import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.mjs';
 import { applicationTypes, authenticationTypes, binaryOptions, databaseTypes, entityOptions, fieldTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.mjs';
@@ -30,7 +30,7 @@ const { PaginationTypes, ServiceTypes, MapperTypes } = entityOptions;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const { OAUTH2 } = authenticationTypes;
 const { CommonDBTypes } = fieldTypes;
-const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
+const { BOOLEAN, LONG, STRING, UUID, INTEGER } = CommonDBTypes;
 const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const { SERVICE_IMPL } = ServiceTypes;
@@ -125,7 +125,7 @@ export default function prepareEntity(entityWithConfig, generator, application)
         if (!entityWithConfig.microserviceName) {
             throw new Error('Microservice name for the entity is not found. Entity cannot be generated!');
         }
-        entityWithConfig.microserviceAppName = generator.getMicroserviceAppName(entityWithConfig.microserviceName);
+        entityWithConfig.microserviceAppName = getMicroserviceAppName({ microserviceName: entityWithConfig.microserviceName });
         entityWithConfig.skipServer = true;
     }
     _.defaults(entityWithConfig, {
@@ -220,9 +220,11 @@ export function derivedPrimaryKeyProperties(primaryKey) {
     _.defaults(primaryKey, {
         hasUUID: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === UUID),
         hasLong: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === LONG),
+        hasInteger: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === INTEGER),
         typeUUID: primaryKey.type === UUID,
         typeString: primaryKey.type === STRING,
         typeLong: primaryKey.type === LONG,
+        typeInteger: primaryKey.type === INTEGER,
         typeNumeric: !primaryKey.composite && primaryKey.fields[0].fieldTypeNumeric,
     });
 }
@@ -320,6 +322,9 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
             get name() {
                 return relationshipId.otherEntity.primaryKey.name;
             },
+            get hibernateSnakeCaseName() {
+                return hibernateSnakeCase(relationshipId.otherEntity.primaryKey.name);
+            },
             get nameCapitalized() {
                 return relationshipId.otherEntity.primaryKey.nameCapitalized;
             },
@@ -358,6 +363,7 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
         entityWithConfig.primaryKey = {
             derived: false,
             name: primaryKeyName,
+            hibernateSnakeCaseName: hibernateSnakeCase(primaryKeyName),
             nameCapitalized: _.upperFirst(primaryKeyName),
             type: primaryKeyType,
             tsType: getTypescriptKeyType(primaryKeyType),
@@ -441,6 +447,17 @@ export function loadRequiredConfigIntoEntity(entity, config) {
         packageName: config.packageName,
         packageFolder: config.packageFolder,
     });
+    if (entity.searchEngine === true && (!entity.microserviceName || entity.microserviceName === config.baseName)) {
+        // If the entity belongs to this application and searchEngine is true.
+        if (config.searchEngine && config.searchEngine !== NO_SEARCH_ENGINE) {
+            // Replace with the searchEngine from the application.
+            entity.searchEngine = config.searchEngine;
+        }
+        else {
+            entity.searchEngine = NO_SEARCH_ENGINE;
+            this?.log.warn('Search engine is enabled at entity level, but disabled at application level. Search engine will be disabled');
+        }
+    }
     if (config.applicationType === MICROSERVICE) {
         _.defaults(entity, {
             microserviceName: config.baseName,
@@ -452,7 +469,7 @@ export function preparePostEntityCommonDerivedProperties(entity) {
     const { fields } = entity;
     const fieldsType = sortedUniq(fields.map(({ fieldType }) => fieldType).filter(fieldType => !fieldIsEnum(fieldType)));
     // TODO move to server generator
-    entity.anyFieldHasDocumentation = entity.fields.some(({ javadoc }) => javadoc);
+    entity.anyFieldHasDocumentation = entity.fields.some(({ documentation }) => documentation);
     entity.anyFieldIsZonedDateTime = fieldsType.includes(ZONED_DATE_TIME);
     entity.anyFieldIsInstant = fieldsType.includes(INSTANT);
     entity.anyFieldIsDuration = fieldsType.includes(DURATION);
@@ -540,7 +557,7 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity) {
     });
     entity.relationshipsContainEagerLoad = entity.relationships.some(relationship => relationship.relationshipEagerLoad);
     entity.containsBagRelationships = entity.relationships.some(relationship => relationship.bagRelationship);
-    entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerReationships apis
+    entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerRelationships apis
         ![CASSANDRA, COUCHBASE, NEO4J].includes(entity.databaseType) &&
             // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
             (entity.reactive || [SQL, MONGODB].includes(entity.databaseType)) &&

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { fieldTypes, validations } from '../../../jdl/jhipster/index.mjs';
 import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.mjs';
 import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.mjs';
@@ -29,34 +29,34 @@ const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes;
 const fakeStringTemplateForFieldName = columnName => {
     let fakeTemplate;
     if (columnName === 'first_name') {
-        fakeTemplate = 'name.firstName';
+        fakeTemplate = 'person.firstName';
     }
     else if (columnName === 'last_name') {
-        fakeTemplate = 'name.lastName';
+        fakeTemplate = 'person.lastName';
     }
     else if (columnName === 'job_title') {
-        fakeTemplate = 'name.jobTitle';
+        fakeTemplate = 'person.jobTitle';
     }
     else if (columnName === 'telephone' || columnName === 'phone') {
         fakeTemplate = 'phone.number';
     }
     else if (columnName === 'zip_code' || columnName === 'post_code') {
-        fakeTemplate = 'address.zipCode';
+        fakeTemplate = 'location.zipCode';
     }
     else if (columnName === 'city') {
-        fakeTemplate = 'address.city';
+        fakeTemplate = 'location.city';
     }
     else if (columnName === 'street_name' || columnName === 'street') {
-        fakeTemplate = 'address.streetName';
+        fakeTemplate = 'location.street';
     }
     else if (columnName === 'country') {
-        fakeTemplate = 'address.country';
+        fakeTemplate = 'location.country';
     }
     else if (columnName === 'country_code') {
-        fakeTemplate = 'address.countryCode';
+        fakeTemplate = 'location.countryCode';
     }
     else if (columnName === 'color') {
-        fakeTemplate = 'commerce.color';
+        fakeTemplate = 'color.human';
     }
     else if (columnName === 'account') {
         fakeTemplate = 'finance.account';
@@ -86,13 +86,13 @@ const fakeStringTemplateForFieldName = columnName => {
         fakeTemplate = 'internet.url';
     }
     else {
-        fakeTemplate = 'random.words';
+        fakeTemplate = 'word.words';
     }
     return `{{${fakeTemplate}}}`;
 };
 /**
  * @param {*} field
- * @param {*} faker
+ * @param {import('@faker-js/faker').Faker} faker
  * @param {*} changelogDate
  * @param {string} type csv, cypress, json-serializable, ts
  * @returns fake value
@@ -133,7 +133,14 @@ function generateFakeDataForField(field, faker, changelogDate, type = 'csv') {
         data = `PT${faker.number.int({ min: 1, max: 59 })}M`;
         // eslint-disable-next-line no-template-curly-in-string
     }
-    else if ([INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL, DURATION].includes(field.fieldType)) {
+    else if ([FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL].includes(field.fieldType)) {
+        data = faker.number.float({
+            max: field.fieldValidateRulesMax ? parseInt(field.fieldValidateRulesMax, 10) : 32767,
+            min: field.fieldValidateRulesMin ? parseInt(field.fieldValidateRulesMin, 10) : 0,
+            precision: 0.01,
+        });
+    }
+    else if ([INTEGER, LONG, DURATION].includes(field.fieldType)) {
         data = faker.number.int({
             max: field.fieldValidateRulesMax ? parseInt(field.fieldValidateRulesMax, 10) : 32767,
             min: field.fieldValidateRulesMin ? parseInt(field.fieldValidateRulesMin, 10) : 0,
@@ -362,7 +369,13 @@ export function fieldToReference(entity, field, pathPrefix = []) {
         field,
         multiple: false,
         owned: true,
-        doc: field.javadoc,
+        doc: field.documentation,
+        get propertyJavadoc() {
+            return field.fieldJavadoc;
+        },
+        get propertyApiDescription() {
+            return field.fieldApiDescription;
+        },
         label: field.fieldNameHumanized,
         name: field.fieldName,
         type: field.fieldType,

package/dist/generators/base-application/support/prepare-relationship.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 import { databaseTypes, entityOptions, reservedKeywords, validations, checkAndReturnRelationshipOnValue, } from '../../../jdl/jhipster/index.mjs';
 import { upperFirstCamelCase } from '../../base/support/string.mjs';
@@ -217,7 +217,13 @@ function relationshipToReference(entity, relationship, pathPrefix = []) {
         relationship,
         owned: relationship.ownerSide,
         collection,
-        doc: relationship.javaDoc,
+        doc: relationship.documentation,
+        get propertyJavadoc() {
+            return relationship.relationshipJavadoc;
+        },
+        get propertyApiDescription() {
+            return relationship.relationshipApiDescription;
+        },
         name,
         nameCapitalized: collection ? relationship.relationshipNameCapitalizedPlural : relationship.relationshipNameCapitalized,
         get type() {

package/dist/generators/base-application/support/relationship.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { stringifyApplicationData } from './debug.mjs';
 import { findEntityInEntities } from './entity.mjs';
 const { upperFirst, lowerFirst } = _;