generator-jhipster 7.8.1 → 7.9.0

package/jdl/jhipster/application-options.js

@@ -94,6 +94,7 @@ const optionNames = {
   ENABLE_TRANSLATION: 'enableTranslation',
   ENTITY_SUFFIX: 'entitySuffix',
   EXPERIMENTAL: 'experimental',
+  GATEWAY_SERVER_PORT: 'gatewayServerPort',
   I_18_N: 'i18N',
   INSTALL_MODULES: 'installModules',
   JHI_PREFIX: 'jhiPrefix',
@@ -101,6 +102,8 @@ const optionNames = {
   JWT_SECRET_KEY: 'jwtSecretKey',
   LANGUAGES: 'languages',
   MESSAGE_BROKER: 'messageBroker',
+  MICROFRONTEND: 'microfrontend',
+  MICROFRONTENDS: 'microfrontends',
   NATIVE_LANGUAGE: 'nativeLanguage',
   NPM: 'npm',
   OTHER_MODULES: 'otherModules',
@@ -194,6 +197,8 @@ const optionValues = {
     kafka: KAFKA,
     false: NO_MESSAGE_BROKER,
   },
+  [optionNames.MICROFRONTEND]: false,
+  [optionNames.MICROFRONTENDS]: [],
   [optionNames.NPM]: true,
   [optionNames.OTHER_MODULES]: [],
   [optionNames.PACKAGE_FOLDER]: 'com/mycompany/myapp',
@@ -264,6 +269,7 @@ const optionTypes = {
   [optionNames.ENABLE_TRANSLATION]: { type: ApplicationOptionTypes.BOOLEAN },
   [optionNames.ENTITY_SUFFIX]: { type: ApplicationOptionTypes.STRING },
   [optionNames.EXPERIMENTAL]: { type: ApplicationOptionTypes.BOOLEAN },
+  [optionNames.GATEWAY_SERVER_PORT]: { type: ApplicationOptionTypes.INTEGER },
   [optionNames.I_18_N]: { type: ApplicationOptionTypes.BOOLEAN },
   [optionNames.INSTALL_MODULES]: { type: ApplicationOptionTypes.BOOLEAN },
   [optionNames.JHI_PREFIX]: { type: ApplicationOptionTypes.STRING },
@@ -271,6 +277,8 @@ const optionTypes = {
   [optionNames.JWT_SECRET_KEY]: { type: ApplicationOptionTypes.STRING },
   [optionNames.LANGUAGES]: { type: ApplicationOptionTypes.LIST },
   [optionNames.MESSAGE_BROKER]: { type: ApplicationOptionTypes.STRING },
+  [optionNames.MICROFRONTEND]: { type: ApplicationOptionTypes.BOOLEAN },
+  [optionNames.MICROFRONTENDS]: { type: ApplicationOptionTypes.LIST },
   [optionNames.NATIVE_LANGUAGE]: { type: ApplicationOptionTypes.STRING },
   [optionNames.NPM]: { type: ApplicationOptionTypes.BOOLEAN },
   [optionNames.OTHER_MODULES]: { type: ApplicationOptionTypes.LIST },

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

@@ -18,7 +18,7 @@
  */
 
 const { MONOLITH, MICROSERVICE, GATEWAY } = require('./application-types');
-const { COUCHBASE, CASSANDRA, MONGODB, SQL, H2_DISK, POSTGRESQL } = require('./database-types');
+const { COUCHBASE, CASSANDRA, MONGODB, NEO4J, SQL, H2_DISK, POSTGRESQL } = require('./database-types');
 const databaseTypes = require('./database-types');
 
 const NO_DATABASE_TYPE = databaseTypes.NO;
@@ -239,7 +239,7 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
   if (typeof options[ENTITY_SUFFIX] === 'boolean' || typeof options[ENTITY_SUFFIX] !== 'string') {
     options[ENTITY_SUFFIX] = OptionValues[ENTITY_SUFFIX];
   }
-  if ([MONGODB, COUCHBASE, CASSANDRA, NO_DATABASE_TYPE].includes(options[DATABASE_TYPE])) {
+  if ([MONGODB, COUCHBASE, CASSANDRA, NEO4J, NO_DATABASE_TYPE].includes(options[DATABASE_TYPE])) {
     options[DEV_DATABASE_TYPE] = options[DATABASE_TYPE];
     options[PROD_DATABASE_TYPE] = options[DATABASE_TYPE];
     if (NO_DATABASE_TYPE !== options[DATABASE_TYPE]) {

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

@@ -46,11 +46,14 @@ const {
   ENABLE_SWAGGER_CODEGEN,
   ENABLE_TRANSLATION,
   ENTITY_SUFFIX,
+  GATEWAY_SERVER_PORT,
   JHIPSTER_VERSION,
   JHI_PREFIX,
   JWT_SECRET_KEY,
   LANGUAGES,
   MESSAGE_BROKER,
+  MICROFRONTEND,
+  MICROFRONTENDS,
   NATIVE_LANGUAGE,
   OTHER_MODULES,
   PACKAGE_NAME,
@@ -77,6 +80,7 @@ const applicationConfigTokens = [
   { name: 'BLUEPRINT', pattern: BLUEPRINT },
   { name: 'EMBEDDABLE_LAUNCH_SCRIPT', pattern: EMBEDDABLE_LAUNCH_SCRIPT },
   { name: 'CREATION_TIMESTAMP', pattern: CREATION_TIMESTAMP },
+  { name: 'GATEWAY_SERVER_PORT', pattern: GATEWAY_SERVER_PORT },
   { name: 'OTHER_MODULES', pattern: OTHER_MODULES },
   { name: 'PACKAGE_NAME', pattern: PACKAGE_NAME },
   { name: 'AUTHENTICATION_TYPE', pattern: AUTHENTICATION_TYPE },
@@ -114,6 +118,8 @@ const applicationConfigTokens = [
   { name: 'REMEMBER_ME_KEY', pattern: REMEMBER_ME_KEY },
   { name: 'ENABLE_GRADLE_ENTERPRISE', pattern: ENABLE_GRADLE_ENTERPRISE },
   { name: 'GRADLE_ENTERPRISE_HOST', pattern: GRADLE_ENTERPRISE_HOST },
+  { name: 'MICROFRONTENDS', pattern: MICROFRONTENDS },
+  { name: 'MICROFRONTEND', pattern: MICROFRONTEND },
 ].map(tokenConfig => {
   tokenConfig.categories = [applicationConfigCategoryToken];
   // This is actually needed as the skipClient & skipServer options are both entity & app options...

package/jdl/parsing/validator.js

@@ -141,6 +141,7 @@ const configPropsValidations = {
     pattern: ALPHABETIC,
     msg: 'frontendBuilder property',
   },
+  GATEWAY_SERVER_PORT: { type: 'INTEGER' },
   JHIPSTER_VERSION: { type: 'STRING' },
   JHI_PREFIX: {
     type: 'NAME',
@@ -162,6 +163,12 @@ const configPropsValidations = {
     pattern: ALPHANUMERIC,
     msg: 'messageBroker property',
   },
+  MICROFRONTENDS: {
+    type: 'list',
+    pattern: ALPHANUMERIC_UNDERSCORE,
+    msg: 'microfrontends property',
+  },
+  MICROFRONTEND: { type: 'BOOLEAN' },
   NATIVE_LANGUAGE: {
     type: 'NAME',
     pattern: LANGUAGE_PATTERN,

package/jdl/validators/application-validator.js

@@ -75,6 +75,7 @@ function checkForValidValues(jdlApplication) {
     'jwtSecretKey',
     'rememberMeKey',
     'languages',
+    'microfrontend',
     'nativeLanguage',
     'jhipsterVersion',
     'dtoSuffix',
@@ -110,7 +111,8 @@ function checkSpecificOptions(option) {
   switch (option.name) {
     case 'clientTheme':
     case 'clientThemeVariant':
-      return;
+    case 'microfrontends':
+      break;
     case 'testFrameworks':
       checkTestFrameworkValues(option.getValue());
       break;

package/jdl/validators/jdl-with-application-validator.js

@@ -43,6 +43,7 @@ module.exports = {
  * Constructor taking the jdl object to check against application settings.
  * @param {JDLObject} jdlObject -  the jdl object to check.
  * @param {Object} logger - the logger to use, default to the console.
+ * @param {Object} [options]
  */
 function createValidator(jdlObject, logger = console, options = {}) {
   if (!jdlObject) {

package/jdl/validators/jdl-without-application-validator.js

@@ -42,13 +42,14 @@ module.exports = {
 /**
  * Constructor taking the jdl object to check against application settings.
  * @param {JDLObject} jdlObject -  the jdl object to check.
- * @param {Object} applicationSettings - the settings object.
+ * @param {Object} [applicationSettings] - the settings object.
  * @param {String} applicationSettings.baseName - the application's name.
  * @param {String} applicationSettings.applicationType - the application type.
  * @param {String} applicationSettings.databaseType - the DB type.
  * @param {Boolean} applicationSettings.skippedUserManagement - whether user management is skipped.
  * @param {Array} applicationSettings.blueprints - the blueprints used.
- * @param {Object} logger - the logger to use, default to the console.
+ * @param {Object} [logger] - the logger to use, default to the console.
+ * @param {Object} [options]
  */
 function createValidator(jdlObject, applicationSettings = {}, logger = console, options = {}) {
   if (!jdlObject) {

package/lib/support/base.cjs

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+const { platform } = require('os');
+
+const isWin32 = platform() === 'win32';
+
+/**
+ * Converts multiples EditFileCallback callbacks into one.
+ *
+ * @param {...import('../../generators/generator-base.js').EditFileCallback} callbacks
+ * @returns {import('../../generators/generator-base.js').EditFileCallback}
+ */
+const joinCallbacks = (...callbacks) => {
+  return function (content, filePath) {
+    if (isWin32 && content.match(/\r\n/)) {
+      callbacks = [ct => ct.replace(/\r\n/g, '\n')].concat(callbacks).concat(ct => ct.replace(/\n/g, '\r\n'));
+    }
+    for (const callback of callbacks) {
+      content = callback.call(this, content, filePath);
+    }
+    return content;
+  };
+};
+
+module.exports = {
+  joinCallbacks,
+};

package/lib/support/needles.cjs

@@ -0,0 +1,221 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+const assert = require('assert');
+const chalk = require('chalk');
+const { kebabCase } = require('lodash');
+const escapeStringRegexp = require('escape-string-regexp');
+
+/**
+ * Change spaces sequences and '>' to allow any number of spaces or new line prefix
+ *
+ * @param {string} str string
+ * @returns {string} string where CRLF is replaced with LF in Windows
+ */
+const convertToPrettierExpressions = str => {
+  return str.replace(/\s+/g, '([\\s\n]*)').replace(/>+/g, '(\n?[\\s]*)>');
+};
+
+/**
+ * Check if contentToCheck existing in content
+ *
+ * @param {string} contentToCheck
+ * @param {string} content
+ * @param {boolean} [ignoreWhitespaces=true]
+ * @returns {boolean} if exists
+ */
+const checkContentIn = (contentToCheck, content, ignoreWhitespaces = true) => {
+  assert(content, 'content is required');
+  assert(contentToCheck, 'contentToCheck is required');
+
+  let re;
+  if (contentToCheck.test) {
+    re = contentToCheck;
+  } else if (ignoreWhitespaces) {
+    re = convertToPrettierExpressions(escapeStringRegexp(contentToCheck));
+  } else {
+    re = contentToCheck
+      .split('\n')
+      .map(line => `\\s*${escapeStringRegexp(line)}`)
+      .join('\n');
+  }
+  if (!re.test) {
+    re = new RegExp(re);
+  }
+  return re.test(content);
+};
+
+/**
+ * Write content before needle applying identation
+ *
+ * @param {object} args
+ * @param {string} args.content - normalized content
+ * @param {string} args.needle
+ * @param {string|string[]} args.contentToAdd
+ * @returns {string|null} null if needle was not found, new content otherwise
+ */
+const insertContentBeforeNeedle = ({ content, contentToAdd, needle }) => {
+  assert(needle, 'needle is required');
+  assert(content, 'content is required');
+  assert(contentToAdd, 'contentToAdd is required');
+
+  const regexp = new RegExp(`(?://|<!--|/*|#) jhipster-needle-${needle}(?:$|\n| )`, 'g');
+  const firstMatch = regexp.exec(content);
+  if (!firstMatch) {
+    return null;
+  }
+  if (regexp.exec(content)) {
+    throw new Error(`Multiple needles found for ${needle}`);
+  }
+
+  const needleIndex = firstMatch.index;
+
+  const needleLineIndex = content.lastIndexOf('\n', needleIndex);
+  const beforeContent = content.substring(0, needleLineIndex + 1);
+  const afterContent = content.substring(needleLineIndex + 1);
+
+  // Find needle ident
+  const needleLine = afterContent.split('\n', 2)[0];
+  const needleIdent = needleLine.length - needleLine.trimStart().length;
+
+  contentToAdd = []
+    .concat(contentToAdd)
+    .map(eachContentToAdd => eachContentToAdd.split('\n'))
+    .flat();
+
+  // Normalize needle ident with contentToAdd.
+  const firstContent = contentToAdd.find(line => line.trim());
+  const contentIdent = firstContent.length - firstContent.trimStart().length;
+  if (needleIdent > contentIdent) {
+    const identToApply = ' '.repeat(needleIdent - contentIdent);
+    contentToAdd = contentToAdd.map(line => (line ? identToApply + line : line));
+  } else if (needleIdent < contentIdent) {
+    let identToRemove = contentIdent - needleIdent;
+    contentToAdd
+      .filter(line => line.trimStart())
+      .forEach(line => {
+        const trimmedLine = line.trimStart();
+        const lineIdent = line.length - trimmedLine.length;
+        if (lineIdent < identToRemove) {
+          identToRemove = lineIdent;
+        }
+      });
+    contentToAdd = contentToAdd.map(line => (line.length > identToRemove ? line.substring(identToRemove) : ''));
+  }
+
+  return `${beforeContent}${contentToAdd.join('\n')}\n${afterContent}`;
+};
+
+/**
+ * Create an callback to insert the new content into existing content.
+ *
+ * @this Generator
+ * @param {object} options
+ * @param {string} options.needle needle to look for
+ * @param {string|string[]} options.contentToAdd content to add
+ * @param {boolean} [options.optional=false] don't throw error if needle was not found
+ * @param {boolean} [options.ignoreWhitespaces=true] check existing content ignoring white spaces and new lines
+ * @returns {import('../../generators/generator-base.js').EditFileCallback}
+ */
+const createNeedleCallback = ({ needle, contentToAdd, optional = false, ignoreWhitespaces = true }) => {
+  assert(needle, 'needle is required');
+  assert(contentToAdd, 'contentToAdd is required');
+
+  /**
+   * @type {import('../../generators/generator-base.js').EditFileCallback}
+   * @this {import('../../generators/generator-base.js')}
+   */
+  return function (content, filePath) {
+    contentToAdd = [].concat(contentToAdd).filter(eachContent => !checkContentIn(eachContent, content, ignoreWhitespaces));
+    if (contentToAdd.length === 0) {
+      return content;
+    }
+
+    const newContent = insertContentBeforeNeedle({
+      needle,
+      content,
+      contentToAdd,
+    });
+    if (newContent) {
+      return newContent;
+    }
+    const message = `Missing ${optional ? 'optional' : 'required'} jhipster-needle ${needle} not found at '${filePath}'`;
+    if (optional) {
+      this.log(chalk.yellow(message));
+      return content;
+    }
+    throw new Error(message);
+  };
+};
+
+/**
+ * Inject content before needle or create a needle insertion callback.
+ *
+ * @param {object} options foo
+ * @param {object} needles
+ * @param {string} options.contentToAdd content to add
+ * @param {Generator} [options.generator] generator if provided, editFile will be executed
+ * @param {string} [options.filePath] path to file
+ * @param {string} [options.needlesPrefix] common needle prefix
+ * @param {boolean} [options.optional=false] throw error if needle was not found
+ * @returns {import('../../generators/generator-base.js').CascatedEditFileCallback | import('../../generators/generator-base.js').EditFileCallback}
+ */
+const createBaseNeedle = (options, needles) => {
+  if (!needles) {
+    needles = options;
+    options = {};
+  }
+
+  assert(needles, 'needles is required');
+  const { generator, filePath, optional = false, ignoreWhitespaces = true } = options;
+  let { needlesPrefix } = options;
+  needlesPrefix = needlesPrefix ? `${needlesPrefix}-` : '';
+
+  const callbacks = Object.entries(needles)
+    .filter(([_key, contentToAdd]) => contentToAdd)
+    .map(([key, contentToAdd]) =>
+      createNeedleCallback({ needle: `${needlesPrefix}${kebabCase(key)}`, contentToAdd, optional, ignoreWhitespaces })
+    );
+
+  assert(callbacks.length > 0, 'At least 1 needle is required');
+
+  const callback =
+    callbacks.length === 1
+      ? callbacks[0]
+      : function (content, ...args) {
+          callbacks.forEach(cb => {
+            content = cb.call(this, content, ...args);
+          });
+          return content;
+        };
+
+  if (generator) {
+    assert(filePath, 'filePath is required');
+
+    return generator.editFile(filePath, callback);
+  }
+
+  return callback;
+};
+
+module.exports = {
+  checkContentIn,
+  insertContentBeforeNeedle,
+  createNeedleCallback,
+  createBaseNeedle,
+};

package/lib/support/shared-data.cjs

@@ -58,7 +58,7 @@ module.exports = class SharedData {
   /**
    * Get choices for a given config.
    * @param {String} configName
-   * @param {Any[]} defaultValueFallback
+   * @param {Any[]} choicesFallback
    * @returns {Any[]}
    */
   getConfigChoices(configName, choicesFallback) {
@@ -72,7 +72,7 @@ module.exports = class SharedData {
   /**
    * Set choices for a given config.
    * @param {String} configName
-   * @param {Any} defaultValue
+   * @param {Any} choices
    */
   setConfigChoices(configName, choices) {
     assert(configName, 'Config name is required');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.8.1",
+  "version": "7.9.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -84,58 +84,60 @@
   },
   "dependencies": {
     "@faker-js/faker": "5.5.3",
-    "aws-sdk": "2.1106.0",
-    "axios": "0.26.1",
+    "aws-sdk": "2.1185.0",
+    "axios": "0.27.2",
     "chalk": "4.1.2",
     "chevrotain": "10.1.2",
-    "commander": "9.1.0",
-    "conf": "10.1.2",
+    "commander": "9.4.0",
+    "conf": "10.2.0",
     "debug": "4.3.4",
     "didyoumean": "1.2.2",
-    "ejs": "3.1.6",
-    "glob": "7.2.0",
+    "ejs": "3.1.8",
+    "escape-string-regexp": "4.0.0",
+    "glob": "8.0.3",
     "insight": "0.11.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
     "mem-fs-editor": "9.4.0",
-    "minimatch": "5.0.1",
+    "minimatch": "5.1.0",
     "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",
+    "parse-gitignore": "2.0.0",
     "pluralize": "8.0.0",
-    "prettier": "2.6.2",
-    "prettier-plugin-java": "1.6.1",
-    "prettier-plugin-packagejson": "2.2.17",
+    "prettier": "2.7.1",
+    "prettier-plugin-java": "1.6.2",
+    "prettier-plugin-packagejson": "2.2.18",
     "progress": "2.0.3",
     "randexp": "0.5.3",
-    "semver": "7.3.5",
+    "semver": "7.3.7",
     "shelljs": "0.8.5",
-    "simple-git": "3.5.0",
+    "simple-git": "3.11.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
-    "winston": "3.6.0",
-    "yeoman-environment": "3.9.1",
-    "yeoman-generator": "5.6.1"
+    "winston": "3.8.1",
+    "yeoman-environment": "3.10.0",
+    "yeoman-generator": "5.7.0"
   },
   "devDependencies": {
     "chai": "4.3.6",
-    "ejs-lint": "1.2.1",
-    "eslint": "8.12.0",
+    "ejs-lint": "1.2.2",
+    "eslint": "8.20.0",
     "eslint-config-airbnb-base": "15.0.0",
     "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.5.1",
-    "fs-extra": "10.0.1",
-    "jsdoc": "3.6.10",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-mocha": "10.1.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "expect": "28.1.3",
+    "fs-extra": "10.1.0",
+    "jest-mock": "28.1.3",
+    "jsdoc": "3.6.11",
     "mocha": "9.2.2",
-    "mocha-expect-snapshot": "3.1.0",
+    "mocha-expect-snapshot": "4.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "13.0.1",
+    "sinon": "14.0.0",
     "sinon-chai": "3.7.0",
     "sort-keys": "4.2.0",
     "yeoman-assert": "3.1.1",

package/utils/blueprint.js

@@ -69,7 +69,7 @@ function parseBluePrints(blueprints) {
 /**
  * @private
  * Merges blueprint arrays, keeping order and version priority.
- * @param {...Blueprint[]} blueprints - Blueprint arrays to be merged.
+ * @param {...Blueprint[]} blueprintsToMerge - Blueprint arrays to be merged.
  * @returns {Blueprint[]} an array that contains the info for each blueprint
  */
 function mergeBlueprints(...blueprintsToMerge) {

package/utils/entity.js

@@ -51,6 +51,7 @@ const BASE_TEMPLATE_DATA = {
 
   requiresPersistableImplementation: false,
   fieldsContainDate: false,
+  fieldsContainTimed: false,
   fieldsContainInstant: false,
   fieldsContainUUID: false,
   fieldsContainZonedDateTime: false,
@@ -213,7 +214,7 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
   const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
   entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
   entityWithConfig.entityPage =
-    microfrontend && microserviceName && (entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
+    microfrontend && microserviceName && entityWithConfig.applicationType === MICROSERVICE
       ? `${microserviceName.toLowerCase()}/${entityFileName}`
       : `${entityFileName}`;
 
@@ -475,9 +476,16 @@ function loadRequiredConfigIntoEntity(entity, config) {
     authenticationType: config.authenticationType,
     reactive: config.reactive,
     microfrontend: config.microfrontend,
+    packageName: config.packageName,
+    packageFolder: config.packageFolder,
     // Workaround different paths
     clientFramework: config.clientFramework,
   });
+  if (config.applicationType === MICROSERVICE) {
+    _.defaults(entity, {
+      microserviceName: config.baseName,
+    });
+  }
   return entity;
 }
 

package/utils/field.js

@@ -93,6 +93,13 @@ const fakeStringTemplateForFieldName = columnName => {
   return `{{${fakeTemplate}}}`;
 };
 
+/**
+ * @param {*} field
+ * @param {*} faker
+ * @param {*} changelogDate
+ * @param {string} type csv, cypress, json-serializable, ts
+ * @returns fake value
+ */
 const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') => {
   let data;
   if (field.fakerTemplate) {
@@ -140,7 +147,7 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
       // See https://stackoverflow.com/a/34053802/150868
       // YYYY-MM-DDTHH:mm:ss
       data = isoDate.split('.')[0];
-      if (type === 'cypress') {
+      if (type === 'cypress' || type === 'ts') {
         // YYYY-MM-DDTHH:mm
         data = data.substr(0, data.length - 3);
       }
@@ -245,7 +252,7 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
     fieldNameUnderscored: _.snakeCase(field.fieldName),
     fieldNameHumanized: _.startCase(field.fieldName),
     fieldTranslationKey: `${entityWithConfig.i18nKeyPrefix}.${field.fieldName}`,
-    tsType: generator.getTypescriptKeyType(field.fieldType),
+    tsType: generator.getTypescriptType(field.fieldType),
     entity: entityWithConfig,
   });
   const fieldType = field.fieldType;
@@ -300,6 +307,10 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
   }
 
   field.fieldIsEnum = !field.id && fieldIsEnum(fieldType);
+  if (field.fieldIsEnum) {
+    field.enumFileName = _.kebabCase(field.fieldType);
+  }
+
   field.fieldWithContentType = (fieldType === BYTES || fieldType === BYTE_BUFFER) && field.fieldTypeBlobContent !== TEXT;
   if (field.fieldWithContentType) {
     field.contentTypeFieldName = `${field.fieldName}ContentType`;
@@ -348,7 +359,7 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
   field.generateFakeData = (type = 'csv') => {
     let data = generateFakeDataForField(field, faker, entityWithConfig.changelogDateForRecent, type);
     // manage uniqueness
-    if (field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE)) {
+    if ((field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE)) || field.id) {
       let i = 0;
       while (field.uniqueValue.indexOf(data) !== -1) {
         if (i++ === 5) {
@@ -389,6 +400,10 @@ function fieldIsEnum(fieldType) {
     BOOLEAN,
     BYTES,
     BYTE_BUFFER,
+    ANY_BLOB,
+    BLOB,
+    IMAGE_BLOB,
+    TEXT_BLOB,
   ].includes(fieldType);
 }