generator-jhipster 7.6.0 → 7.8.1

package/lib/constants/priorities.cjs

@@ -57,18 +57,50 @@ const PREPARING = 'preparing';
 const PREPARING_PRIORITY = `${PRIORITY_PREFIX}${PREPARING}`;
 const PREPARING_QUEUE = `${QUEUE_PREFIX}${PREPARING}`;
 
+const CONFIGURING_EACH_ENTITY = 'configuringEachEntity';
+const CONFIGURING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${CONFIGURING_EACH_ENTITY}`;
+const CONFIGURING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${CONFIGURING_EACH_ENTITY}`;
+
+const LOADING_EACH_ENTITY = 'loadingEachEntity';
+const LOADING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${LOADING_EACH_ENTITY}`;
+const LOADING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${LOADING_EACH_ENTITY}`;
+
+const PREPARING_EACH_ENTITY = 'preparingEachEntity';
+const PREPARING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY}`;
+const PREPARING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY}`;
+
 const PREPARING_FIELDS = 'preparingFields';
 const PREPARING_FIELDS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_FIELDS}`;
 const PREPARING_FIELDS_QUEUE = `${QUEUE_PREFIX}${PREPARING_FIELDS}`;
 
+const PREPARING_EACH_ENTITY_FIELD = 'preparingEachEntityField';
+const PREPARING_EACH_ENTITY_FIELD_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY_FIELD}`;
+const PREPARING_EACH_ENTITY_FIELD_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY_FIELD}`;
+
 const PREPARING_RELATIONSHIPS = 'preparingRelationships';
 const PREPARING_RELATIONSHIPS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_RELATIONSHIPS}`;
 const PREPARING_RELATIONSHIPS_QUEUE = `${QUEUE_PREFIX}${PREPARING_RELATIONSHIPS}`;
 
+const PREPARING_EACH_ENTITY_RELATIONSHIP = 'preparingEachEntityRelationship';
+const PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY_RELATIONSHIP}`;
+const PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY_RELATIONSHIP}`;
+
+const POST_PREPARING_EACH_ENTITY = 'postPreparingEachEntity';
+const POST_PREPARING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${POST_PREPARING_EACH_ENTITY}`;
+const POST_PREPARING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${POST_PREPARING_EACH_ENTITY}`;
+
+const WRITING_ENTITIES = 'writingEntities';
+const WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${WRITING_ENTITIES}`;
+const WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${WRITING_ENTITIES}`;
+
 const POST_WRITING = 'postWriting';
 const POST_WRITING_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING}`;
 const POST_WRITING_QUEUE = `${QUEUE_PREFIX}${POST_WRITING}`;
 
+const POST_WRITING_ENTITIES = 'postWritingEntities';
+const POST_WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING_ENTITIES}`;
+const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
+
 /** @private */
 const PRE_CONFLICTS = 'preConflicts';
 /** @private */
@@ -89,59 +121,122 @@ const CUSTOM_PRIORITIES = [
     priorityName: LOADING,
     queueName: LOADING_QUEUE,
     before: PREPARING,
+    args: generator => generator.getArgsForPriority(LOADING),
   },
   {
     priorityName: PREPARING,
     queueName: PREPARING_QUEUE,
     before: PREPARING_FIELDS,
+    args: generator => generator.getArgsForPriority(PREPARING),
   },
   {
     priorityName: PREPARING_FIELDS,
     queueName: PREPARING_FIELDS_QUEUE,
     before: PREPARING_RELATIONSHIPS,
+    args: generator => generator.getArgsForPriority(PREPARING_FIELDS),
   },
   {
     priorityName: PREPARING_RELATIONSHIPS,
     queueName: PREPARING_RELATIONSHIPS_QUEUE,
     before: DEFAULT,
+    args: generator => generator.getArgsForPriority(PREPARING_RELATIONSHIPS),
+  },
+  {
+    priorityName: DEFAULT,
+    args: generator => generator.getArgsForPriority(DEFAULT),
+    edit: true,
+  },
+  {
+    priorityName: WRITING,
+    args: generator => generator.getArgsForPriority(WRITING),
+    edit: true,
   },
   {
     priorityName: POST_WRITING,
     queueName: POST_WRITING_QUEUE,
     before: PRE_CONFLICTS,
+    args: generator => generator.getArgsForPriority(POST_WRITING),
   },
   {
     priorityName: PRE_CONFLICTS,
     queueName: PRE_CONFLICTS_QUEUE,
+    args: generator => generator.getArgsForPriority(PRE_CONFLICTS),
     before: CONFLICTS,
   },
+  {
+    priorityName: INSTALL,
+    args: generator => generator.getArgsForPriority(INSTALL),
+    edit: true,
+  },
+  {
+    priorityName: END,
+    args: generator => generator.getArgsForPriority(END),
+    edit: true,
+  },
 ].reverse();
 
 const compat = {
+  PRIORITY_PREFIX: '',
   INITIALIZING_PRIORITY: INITIALIZING,
   PROMPTING_PRIORITY: PROMPTING,
   CONFIGURING_PRIORITY: CONFIGURING,
   COMPOSING_PRIORITY: COMPOSING,
   LOADING_PRIORITY: LOADING,
   PREPARING_PRIORITY: PREPARING,
+
+  CONFIGURING_EACH_ENTITY_PRIORITY: CONFIGURING_EACH_ENTITY,
+  LOADING_EACH_ENTITY_PRIORITY: LOADING_EACH_ENTITY,
+  PREPARING_EACH_ENTITY_PRIORITY: PREPARING_EACH_ENTITY,
   PREPARING_FIELDS_PRIORITY: PREPARING_FIELDS,
+  PREPARING_EACH_ENTITY_FIELD_PRIORITY: PREPARING_EACH_ENTITY_FIELD,
   PREPARING_RELATIONSHIPS_PRIORITY: PREPARING_RELATIONSHIPS,
+  PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY: PREPARING_EACH_ENTITY_RELATIONSHIP,
+  POST_PREPARING_EACH_ENTITY_PRIORITY: POST_PREPARING_EACH_ENTITY,
+
   DEFAULT_PRIORITY: DEFAULT,
   WRITING_PRIORITY: WRITING,
+  WRITING_ENTITIES_PRIORITY: WRITING_ENTITIES,
   POST_WRITING_PRIORITY: POST_WRITING,
+  POST_WRITING_ENTITIES_PRIORITY: POST_WRITING_ENTITIES,
+  PRE_CONFLICTS_PRIORITY: PRE_CONFLICTS,
   INSTALL_PRIORITY: INSTALL,
   END_PRIORITY: END,
 };
 
-const PRIORITY_NAMES = [
+const PRIORITY_NAMES = {
   INITIALIZING,
   PROMPTING,
   CONFIGURING,
   COMPOSING,
   LOADING,
   PREPARING,
+
+  CONFIGURING_EACH_ENTITY,
+  LOADING_EACH_ENTITY,
+  PREPARING_EACH_ENTITY,
   PREPARING_FIELDS,
+  PREPARING_EACH_ENTITY_FIELD,
   PREPARING_RELATIONSHIPS,
+  PREPARING_EACH_ENTITY_RELATIONSHIP,
+  POST_PREPARING_EACH_ENTITY,
+
+  DEFAULT,
+  WRITING,
+  WRITING_ENTITIES,
+  POST_WRITING,
+  POST_WRITING_ENTITIES,
+  PRE_CONFLICTS,
+  INSTALL,
+  END,
+};
+
+const BASE_PRIORITY_NAMES = [
+  INITIALIZING,
+  PROMPTING,
+  CONFIGURING,
+  COMPOSING,
+  LOADING,
+  PREPARING,
   DEFAULT,
   WRITING,
   POST_WRITING,
@@ -149,11 +244,120 @@ const PRIORITY_NAMES = [
   END,
 ];
 
+const CUSTOM_PRIORITIES_ENTITIES = [
+  {
+    priorityName: CONFIGURING_EACH_ENTITY,
+    queueName: CONFIGURING_EACH_ENTITY_QUEUE,
+    before: LOADING_EACH_ENTITY,
+    skip: true,
+  },
+  {
+    priorityName: LOADING_EACH_ENTITY,
+    queueName: LOADING_EACH_ENTITY_QUEUE,
+    before: PREPARING_EACH_ENTITY,
+    skip: true,
+  },
+  {
+    priorityName: PREPARING_EACH_ENTITY,
+    queueName: PREPARING_EACH_ENTITY_QUEUE,
+    before: PREPARING_FIELDS,
+    skip: true,
+  },
+  {
+    priorityName: PREPARING_EACH_ENTITY_FIELD,
+    queueName: PREPARING_EACH_ENTITY_FIELD_QUEUE,
+    before: PREPARING_RELATIONSHIPS,
+    skip: true,
+  },
+  {
+    priorityName: PREPARING_EACH_ENTITY_RELATIONSHIP,
+    queueName: PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE,
+    before: POST_PREPARING_EACH_ENTITY,
+    skip: true,
+  },
+  {
+    priorityName: POST_PREPARING_EACH_ENTITY,
+    queueName: POST_PREPARING_EACH_ENTITY_QUEUE,
+    before: DEFAULT,
+    skip: true,
+  },
+  {
+    priorityName: WRITING_ENTITIES,
+    queueName: WRITING_ENTITIES_QUEUE,
+    before: POST_WRITING,
+    skip: true,
+  },
+  {
+    priorityName: POST_WRITING_ENTITIES,
+    queueName: POST_WRITING_ENTITIES_QUEUE,
+    before: POST_WRITING,
+    skip: true,
+  },
+].reverse();
+
+const QUEUES = {
+  INITIALIZING_QUEUE: INITIALIZING,
+  PROMPTING_QUEUE: PROMPTING,
+  CONFIGURING_QUEUE: CONFIGURING,
+  COMPOSING_QUEUE,
+  LOADING_QUEUE,
+  PREPARING_QUEUE,
+
+  CONFIGURING_EACH_ENTITY_QUEUE,
+  LOADING_EACH_ENTITY_QUEUE,
+  PREPARING_EACH_ENTITY_QUEUE,
+  PREPARING_FIELDS_QUEUE,
+  PREPARING_EACH_ENTITY_FIELD_QUEUE,
+  PREPARING_RELATIONSHIPS_QUEUE,
+  PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE,
+
+  DEFAULT_QUEUE: DEFAULT,
+  WRITING_QUEUE: WRITING,
+  WRITING_ENTITIES_QUEUE,
+  POST_WRITING_QUEUE,
+  POST_WRITING_ENTITIES_QUEUE,
+  PRE_CONFLICTS_QUEUE,
+  INSTALL_QUEUE: INSTALL,
+  END_QUEUE: END,
+};
+
+const ENTITY_PRIORITY_NAMES = [
+  INITIALIZING,
+  PROMPTING,
+  CONFIGURING,
+  COMPOSING,
+  LOADING,
+  PREPARING,
+  PREPARING_FIELDS,
+  PREPARING_RELATIONSHIPS,
+  DEFAULT,
+  WRITING,
+  POST_WRITING,
+  INSTALL,
+  END,
+];
+
+const BASE_ENTITY_PRIORITY_NAMES = [
+  CONFIGURING_EACH_ENTITY,
+  LOADING_EACH_ENTITY,
+  PREPARING_EACH_ENTITY,
+  PREPARING_EACH_ENTITY_FIELD,
+  PREPARING_EACH_ENTITY_RELATIONSHIP,
+  POST_PREPARING_EACH_ENTITY,
+  WRITING_ENTITIES,
+  POST_WRITING_ENTITIES,
+];
+
 module.exports = {
+  PRIORITY_NAMES,
   PRIORITY_PREFIX,
   CUSTOM_PRIORITIES,
-  PRIORITY_NAMES,
+  CUSTOM_PRIORITIES_ENTITIES,
+  BASE_PRIORITY_NAMES,
+  ENTITY_PRIORITY_NAMES,
+  BASE_ENTITY_PRIORITY_NAMES,
   compat,
+  QUEUES,
 
   INITIALIZING_PRIORITY,
   PROMPTING_PRIORITY,
@@ -161,11 +365,21 @@ module.exports = {
   COMPOSING_PRIORITY,
   LOADING_PRIORITY,
   PREPARING_PRIORITY,
+
+  CONFIGURING_EACH_ENTITY_PRIORITY,
+  LOADING_EACH_ENTITY_PRIORITY,
+  PREPARING_EACH_ENTITY_PRIORITY,
   PREPARING_FIELDS_PRIORITY,
+  PREPARING_EACH_ENTITY_FIELD_PRIORITY,
   PREPARING_RELATIONSHIPS_PRIORITY,
+  PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
+  POST_PREPARING_EACH_ENTITY_PRIORITY,
+
   DEFAULT_PRIORITY,
   WRITING_PRIORITY,
+  WRITING_ENTITIES_PRIORITY,
   POST_WRITING_PRIORITY,
+  POST_WRITING_ENTITIES_PRIORITY,
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
   END_PRIORITY,

package/lib/constants/priorities.mjs

@@ -16,4 +16,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default } from './priorities.cjs';
+
+export {
+  PRIORITY_PREFIX,
+  PRIORITY_NAMES,
+  BASE_PRIORITY_NAMES,
+  ENTITY_PRIORITY_NAMES,
+  INITIALIZING_PRIORITY,
+  PROMPTING_PRIORITY,
+  CONFIGURING_PRIORITY,
+  COMPOSING_PRIORITY,
+  LOADING_PRIORITY,
+  PREPARING_PRIORITY,
+  CONFIGURING_EACH_ENTITY_PRIORITY,
+  LOADING_EACH_ENTITY_PRIORITY,
+  PREPARING_EACH_ENTITY_PRIORITY,
+  PREPARING_EACH_ENTITY_FIELD_PRIORITY,
+  PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
+  PREPARING_FIELDS_PRIORITY,
+  PREPARING_RELATIONSHIPS_PRIORITY,
+  POST_PREPARING_EACH_ENTITY_PRIORITY,
+  DEFAULT_PRIORITY,
+  WRITING_PRIORITY,
+  WRITING_ENTITIES_PRIORITY,
+  POST_WRITING_PRIORITY,
+  POST_WRITING_ENTITIES_PRIORITY,
+  PRE_CONFLICTS_PRIORITY,
+  INSTALL_PRIORITY,
+  END_PRIORITY,
+} from './priorities.cjs';

package/lib/index.mjs

@@ -0,0 +1,6 @@
+export { default as constants } from '../generators/generator-constants.js';
+export { default as utils } from '../generators/utils.js';
+
+export { default as GeneratorBase } from '../generators/generator-base.js';
+export { default as GeneratorBaseBlueprint } from '../generators/generator-base-blueprint.js';
+export { default as GeneratorBaseEntities } from '../generators/generator-base-entities.cjs';

package/lib/support/mixin.cjs

@@ -55,9 +55,13 @@ function getChain(...generators) {
  * @returns Class
  */
 module.exports.generateMixedChain = (...generators) => {
+  let baseGenerator = GeneratorBaseBlueprint;
+  if (typeof generators[0] !== 'string') {
+    baseGenerator = generators.shift();
+  }
   const mixedChain = getChain(...generators);
 
-  let MixedClass = class extends GeneratorBaseBlueprint {
+  let MixedClass = class extends baseGenerator {
     constructor(args, options, features) {
       super(args, options, features);
       if (!this.fromBlueprint && this.features.taskPrefix === undefined) {

package/lib/support/shared-data.cjs

@@ -19,9 +19,17 @@
 const assert = require('assert');
 
 module.exports = class SharedData {
-  constructor() {
+  constructor(storage) {
+    if (!storage) {
+      throw new Error('Storage is required for SharedData');
+    }
     this._configDefaultValues = {};
     this._configChoices = {};
+
+    // Backward compatibility sharedData
+    this._storage = storage;
+    this._storage.sharedEntities = this._storage.sharedEntities || {};
+    this._storage.sharedApplication = this._storage.sharedApplication || {};
   }
 
   /**
@@ -71,4 +79,29 @@ module.exports = class SharedData {
     assert(Array.isArray(choices), `Choices must be an array for ${configName}`);
     this._configChoices[configName] = choices;
   }
+
+  getApplication() {
+    if (!this._storage.sharedApplication) throw new Error('Shared application not loaded');
+    return this._storage.sharedApplication;
+  }
+
+  setEntity(entityName, entity) {
+    this._storage.sharedEntities[entityName] = entity;
+  }
+
+  hasEntity(entityName) {
+    return Boolean(this._storage.sharedEntities[entityName]);
+  }
+
+  getEntity(entityName) {
+    const entity = this._storage.sharedEntities[entityName];
+    if (!entity) {
+      throw new Error(`Entity definition not loaded for ${entityName}`);
+    }
+    return entity;
+  }
+
+  getEntities(entityNames = Object.keys(this._storage.sharedEntities)) {
+    return entityNames.map(entityName => ({ entityName, entity: this.getEntity(entityName) }));
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.6.0",
+  "version": "7.8.1",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -35,14 +35,17 @@
     "url": "https://github.com/jdubois"
   },
   "exports": {
-    ".": "./lib/index.js",
+    ".": {
+      "import": "./lib/index.mjs",
+      "default": "./lib/index.js"
+    },
     "./cli/": "./cli/",
     "./generators/": "./generators/",
     "./jdl/": "./jdl/",
     "./lib/": "./lib/",
     "./utils/": "./utils/",
     "./package.json": "./package.json",
-    "./esm/cli": "./cli/program.js",
+    "./esm/cli": "./cli/index.mjs",
     "./esm/generators/*": "./generators/*/esm.mjs",
     "./esm/generators": "./lib/constants/generators.mjs",
     "./esm/priorities": "./lib/constants/priorities.mjs",
@@ -58,9 +61,9 @@
     "jdl",
     "lib",
     "utils",
-    "!__*",
-    "!*.snap",
-    "!*.spec.?(c|m)js"
+    "!**/__*",
+    "!**/*.snap",
+    "!**/*.spec.?(c|m)js"
   ],
   "scripts": {
     "completion": "tabtab install --name jhipster --auto",
@@ -80,62 +83,63 @@
     "update-snapshots": "npm run update-snapshot -- test generators"
   },
   "dependencies": {
-    "aws-sdk": "2.1062.0",
-    "axios": "0.25.0",
+    "@faker-js/faker": "5.5.3",
+    "aws-sdk": "2.1106.0",
+    "axios": "0.26.1",
     "chalk": "4.1.2",
-    "chevrotain": "10.0.0",
-    "commander": "8.3.0",
-    "conf": "10.1.1",
-    "debug": "4.3.3",
+    "chevrotain": "10.1.2",
+    "commander": "9.1.0",
+    "conf": "10.1.2",
+    "debug": "4.3.4",
     "didyoumean": "1.2.2",
     "ejs": "3.1.6",
-    "faker": "5.5.3",
     "glob": "7.2.0",
     "insight": "0.11.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "mem-fs-editor": "9.4.0",
-    "minimatch": "3.0.4",
+    "minimatch": "5.0.1",
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
     "p-queue": "6.6.2",
     "p-transform": "1.3.0",
     "parse-gitignore": "1.0.1",
     "pluralize": "8.0.0",
-    "prettier": "2.5.1",
+    "prettier": "2.6.2",
     "prettier-plugin-java": "1.6.1",
-    "prettier-plugin-packagejson": "2.2.15",
+    "prettier-plugin-packagejson": "2.2.17",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "semver": "7.3.5",
     "shelljs": "0.8.5",
-    "simple-git": "3.0.3",
+    "simple-git": "3.5.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
-    "winston": "3.4.0",
+    "winston": "3.6.0",
     "yeoman-environment": "3.9.1",
     "yeoman-generator": "5.6.1"
   },
   "devDependencies": {
-    "chai": "4.3.4",
+    "chai": "4.3.6",
     "ejs-lint": "1.2.1",
-    "eslint": "8.7.0",
+    "eslint": "8.12.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-chai-friendly": "^0.7.1",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-chai-friendly": "0.7.2",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-mocha": "10.0.3",
     "eslint-plugin-prettier": "4.0.0",
-    "expect": "27.4.6",
-    "fs-extra": "10.0.0",
-    "jsdoc": "3.6.7",
-    "mocha": "9.1.4",
-    "mocha-expect-snapshot": "2.1.0",
+    "expect": "27.5.1",
+    "fs-extra": "10.0.1",
+    "jsdoc": "3.6.10",
+    "mocha": "9.2.2",
+    "mocha-expect-snapshot": "3.1.0",
     "proxyquire": "2.1.3",
-    "sinon": "12.0.1",
+    "sinon": "13.0.1",
     "sinon-chai": "3.7.0",
+    "sort-keys": "4.2.0",
     "yeoman-assert": "3.1.1",
-    "yeoman-test": "6.2.0"
+    "yeoman-test": "6.3.0"
   },
   "engines": {
     "node": "^12.20.0 || ^14.13.1 || >=16.0.0",

package/utils/entity.js

@@ -19,6 +19,8 @@
 
 const _ = require('lodash');
 const pluralize = require('pluralize');
+const path = require('path');
+
 const { createFaker } = require('./faker');
 const { parseLiquibaseChangelogDate } = require('./liquibase');
 const { entityDefaultConfig } = require('../generators/generator-defaults');
@@ -45,7 +47,9 @@ const BASE_TEMPLATE_DATA = {
   haveFieldWithJavadoc: false,
   existingEnum: false,
   searchEngine: false,
+  microserviceName: undefined,
 
+  requiresPersistableImplementation: false,
   fieldsContainDate: false,
   fieldsContainInstant: false,
   fieldsContainUUID: false,
@@ -84,7 +88,7 @@ const BASE_TEMPLATE_DATA = {
     return [];
   },
   get differentRelationships() {
-    return [];
+    return {};
   },
   get i18nToLoad() {
     return [];
@@ -109,7 +113,9 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
   const entityName = _.upperFirst(entityWithConfig.name);
   _.defaults(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
 
-  entityWithConfig.changelogDateForRecent = parseLiquibaseChangelogDate(entityWithConfig.changelogDate);
+  if (entityWithConfig.changelogDate) {
+    entityWithConfig.changelogDateForRecent = parseLiquibaseChangelogDate(entityWithConfig.changelogDate);
+  }
   entityWithConfig.faker = entityWithConfig.faker || createFaker(generator.jhipsterConfig.nativeLanguage);
   entityWithConfig.resetFakerSeed = (suffix = '') =>
     entityWithConfig.faker.seed(stringHashCode(entityWithConfig.name.toLowerCase() + suffix));
@@ -238,6 +244,18 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
   return entityWithConfig;
 }
 
+function prepareEntityServerDomainForTemplates(entity) {
+  const { entityPackage, packageName, packageFolder, persistClass } = entity;
+  let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder } = entity;
+  if (entityPackage) {
+    entityAbsolutePackage = [packageName, entityPackage].join('.');
+    entityAbsoluteFolder = path.join(packageFolder, entityPackage.replace(/\./g, '/'));
+  }
+  entity.entityAbsolutePackage = entityAbsolutePackage;
+  entity.entityAbsoluteFolder = entityAbsoluteFolder;
+  entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
+}
+
 function derivedPrimaryKeyProperties(primaryKey) {
   _.defaults(primaryKey, {
     hasUUID: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === UUID),
@@ -465,6 +483,7 @@ function loadRequiredConfigIntoEntity(entity, config) {
 
 module.exports = {
   prepareEntityForTemplates,
+  prepareEntityServerDomainForTemplates,
   prepareEntityPrimaryKeyForTemplates,
   loadRequiredConfigIntoEntity,
   derivedPrimaryKeyProperties,

package/utils/faker.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const Faker = require('faker/lib');
+const Faker = require('@faker-js/faker/lib');
 const Randexp = require('randexp');
 
 const { languageToJavaLanguage } = require('../generators/utils');
@@ -46,11 +46,11 @@ function createFaker(nativeLanguage = 'en') {
   nativeLanguage = languageToJavaLanguage(nativeLanguage);
   // Fallback language
   // eslint-disable-next-line global-require
-  const locales = { en: require('faker/lib/locales/en') };
+  const locales = { en: require('@faker-js/faker/lib/locales/en') };
   if (nativeLanguage !== 'en') {
     try {
       // eslint-disable-next-line global-require, import/no-dynamic-require
-      const nativeLanguageLocale = require(`faker/lib/locales/${nativeLanguage}`);
+      const nativeLanguageLocale = require(`@faker-js/faker/lib/locales/${nativeLanguage}`);
       locales[nativeLanguage] = nativeLanguageLocale;
     } catch (error) {
       // Faker not implemented for the native language, fallback to en.