generator-jhipster 7.7.0 → 7.9.0

package/generators/generator-base-private.js

@@ -34,6 +34,8 @@ const { languageToJavaLanguage } = require('./utils');
 const JSONToJDLEntityConverter = require('../jdl/converters/json-to-jdl-entity-converter');
 const JSONToJDLOptionConverter = require('../jdl/converters/json-to-jdl-option-converter');
 const { stringify } = require('../utils');
+const { fieldIsEnum } = require('../utils/field');
+const { databaseData } = require('./sql-constants');
 
 const { ANGULAR, REACT, VUE } = SUPPORTED_CLIENT_FRAMEWORKS;
 const dbTypes = require('../jdl/jhipster/field-types');
@@ -104,6 +106,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @param {any} _this - reference to generator
    * @param {string} resourceDir - resource directory
    * @param {string} lang - language code
+   * @param {string} testResourceDir - test resource directory
    */
   installI18nServerFilesByLanguage(_this, resourceDir, lang, testResourceDir) {
     const generator = _this || this;
@@ -196,6 +199,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Update Languages In MailServiceIT
    *
    * @param languages
+   * @param packageFolder
    */
   updateLanguagesInLanguageMailServiceIT(languages, packageFolder) {
     const fullPath = `${SERVER_TEST_SRC_DIR}${packageFolder}/service/MailServiceIT.java`;
@@ -431,7 +435,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (this.options.reproducible) {
       return projectNameReproducibleConfigForTests.baseName;
     }
-    return /^[a-zA-Z0-9_]+$/.test(path.basename(process.cwd())) ? path.basename(process.cwd()) : 'jhipster';
+    return /^[a-zA-Z0-9_-]+$/.test(path.basename(process.cwd()))
+      ? path.basename(process.cwd()).replace('generator-jhipster-', '')
+      : 'jhipster';
   }
 
   /**
@@ -545,10 +551,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is number; false otherwise
    */
   isNumber(input) {
-    if (isNaN(this.filterNumber(input))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input));
   }
 
   /**
@@ -556,10 +559,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is a signed number; false otherwise
    */
   isSignedNumber(input) {
-    if (isNaN(this.filterNumber(input, true))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input, true));
   }
 
   /**
@@ -567,10 +567,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @returns {boolean} true if input is a signed decimal number; false otherwise
    */
   isSignedDecimalNumber(input) {
-    if (isNaN(this.filterNumber(input, true, true))) {
-      return false;
-    }
-    return true;
+    return !isNaN(this.filterNumber(input, true, true));
   }
 
   /**
@@ -808,7 +805,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
       } else {
         const javaVersion = stderr.match(/(?:java|openjdk) version "(.*)"/)[1];
         if (!javaVersion.match(new RegExp(`(${JAVA_COMPATIBLE_VERSIONS.map(ver => `^${ver}`).join('|')})`))) {
-          const [latest, ...others] = JAVA_COMPATIBLE_VERSIONS.reverse();
+          const [latest, ...others] = JAVA_COMPATIBLE_VERSIONS.concat().reverse();
           this.warning(
             `Java ${others.reverse().join(', ')} or ${latest} are not found on your computer. Your Java version is: ${chalk.yellow(
               javaVersion
@@ -850,6 +847,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Generate Entity Client Field Default Values
    *
    * @param {Array|Object} fields - array of fields
+   * @param [clientFramework]
    * @returns {Array} defaultVariablesValues
    */
   generateEntityClientFieldDefaultValues(fields, clientFramework = ANGULAR) {
@@ -871,7 +869,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
   /**
    * Find key type for Typescript
    *
-   * @param {string} primaryKey - primary key definition
+   * @param {string | object} primaryKey - primary key definition
    * @returns {string} primary key type in Typescript
    */
   getTypescriptKeyType(primaryKey) {
@@ -884,6 +882,28 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     return 'string';
   }
 
+  /**
+   * Find type for Typescript
+   *
+   * @param {string} fieldType - field type
+   * @returns {string} field type in Typescript
+   */
+  getTypescriptType(fieldType) {
+    if ([TYPE_INTEGER, TYPE_LONG, TYPE_FLOAT, TYPE_DOUBLE, TYPE_BIG_DECIMAL].includes(fieldType)) {
+      return 'number';
+    }
+    if ([TYPE_LOCAL_DATE, TYPE_ZONED_DATE_TIME, TYPE_INSTANT].includes(fieldType)) {
+      return 'dayjs.Dayjs';
+    }
+    if ([TYPE_BOOLEAN].includes(fieldType)) {
+      return 'boolean';
+    }
+    if (fieldIsEnum(fieldType)) {
+      return fieldType;
+    }
+    return 'string';
+  }
+
   /**
    * Generate Entity Client Field Declarations
    *
@@ -891,6 +911,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * @param {Array|Object} fields - array of fields
    * @param {Array|Object} relationships - array of relationships
    * @param {string} dto - dto
+   * @param [customDateType]
    * @param {boolean} embedded - either the actual entity is embedded or not
    * @returns variablesWithTypes: Array
    */
@@ -985,13 +1006,13 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     const typeImports = new Map();
     const uniqueEnums = {};
     fields.forEach(field => {
-      const fileName = _.kebabCase(field.fieldType);
-      if (field.fieldIsEnum && (!uniqueEnums[field.fieldType] || (uniqueEnums[field.fieldType] && field.fieldValues.length !== 0))) {
-        const importType = `${field.fieldType}`;
+      const { enumFileName, fieldType } = field;
+      if (field.fieldIsEnum && (!uniqueEnums[fieldType] || (uniqueEnums[fieldType] && field.fieldValues.length !== 0))) {
+        const importType = `${fieldType}`;
         const basePath = clientFramework === VUE ? '@' : 'app';
         const modelPath = clientFramework === ANGULAR ? 'entities' : 'shared/model';
-        const importPath = `${basePath}/${modelPath}/enumerations/${fileName}.model`;
-        uniqueEnums[field.fieldType] = field.fieldType;
+        const importPath = `${basePath}/${modelPath}/enumerations/${enumFileName}.model`;
+        uniqueEnums[fieldType] = field.fieldType;
         typeImports.set(importType, importPath);
       }
     });
@@ -1044,6 +1065,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
   /**
    * Generate language objects in array of "'en': { name: 'English' }" format
    * @param {string[]} languages
+   * @param clientFramework
    * @returns generated language options
    */
   generateLanguageOptions(languages, clientFramework) {
@@ -1149,10 +1171,48 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     );
   }
 
+  /**
+   * Generate a test entity, according to the references
+   *
+   * @param references
+   * @param additionalFields
+   * @return {String} test sample
+   */
+  generateTypescriptTestEntity(references, additionalFields = {}) {
+    const entries = references
+      .map(reference => {
+        if (reference.field) {
+          const field = reference.field;
+          const { fieldIsEnum, fieldType, fieldTypeTimed, fieldTypeLocalDate, fieldWithContentType, fieldName, contentTypeFieldName } =
+            field;
+
+          const fakeData = field.generateFakeData('ts');
+          if (fieldWithContentType) {
+            return [
+              [fieldName, fakeData],
+              [contentTypeFieldName, "'unknown'"],
+            ];
+          }
+          if (fieldIsEnum) {
+            return [[fieldName, `${fieldType}[${fakeData}]`]];
+          }
+          if (fieldTypeTimed || fieldTypeLocalDate) {
+            return [[fieldName, `dayjs(${fakeData})`]];
+          }
+          return [[fieldName, fakeData]];
+        }
+        return [[reference.name, this.generateTestEntityId(reference.type, 'random', false)]];
+      })
+      .flat();
+    return `{
+  ${[...entries, ...Object.entries(additionalFields)].map(([key, value]) => `${key}: ${value}`).join(',\n  ')}
+}`;
+  }
+
   /**
    * Generate a test entity, according to the type
    *
-   * @param {any} primaryKey - primary key definition.
+   * @param references
    * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
    */
   generateTestEntity(references, index = 'random') {
@@ -1205,62 +1265,54 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (!protocol) {
       throw new Error('protocol is required');
     }
-    if (!options.databaseName) {
+    const { databaseName } = options;
+    if (!databaseName) {
       throw new Error("option 'databaseName' is required");
     }
     if ([MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL].includes(databaseType) && !options.hostname) {
       throw new Error(`option 'hostname' is required for ${databaseType} databaseType`);
+    } else if (![MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL, H2_DISK, H2_MEMORY].includes(databaseType)) {
+      throw new Error(`${databaseType} databaseType is not supported`);
     }
-    let dbcUrl;
-    let extraOptions;
-    if (databaseType === MYSQL) {
-      dbcUrl = `${protocol}:mysql://${options.hostname}:3306/${options.databaseName}`;
-      extraOptions =
-        '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true';
-    } else if (databaseType === MARIADB) {
-      dbcUrl = `${protocol}:mariadb://${options.hostname}:3306/${options.databaseName}`;
-      extraOptions = '?useLegacyDatetimeCode=false&serverTimezone=UTC';
-    } else if (databaseType === POSTGRESQL) {
-      dbcUrl = `${protocol}:postgresql://${options.hostname}:5432/${options.databaseName}`;
-    } else if (databaseType === ORACLE) {
-      dbcUrl = `${protocol}:oracle:thin:@${options.hostname}:1521:${options.databaseName}`;
-    } else if (databaseType === MSSQL) {
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:mssql://${options.hostname}:1433/${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:sqlserver://${options.hostname}:1433;database=${options.databaseName}`;
-      }
-    } else if (databaseType === H2_DISK) {
-      if (!options.localDirectory) {
-        throw new Error(`'localDirectory' option should be provided for ${databaseType} databaseType`);
-      }
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:h2:file://${options.localDirectory}/${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:h2:file:${options.localDirectory}/${options.databaseName}`;
-      }
-      extraOptions = ';DB_CLOSE_DELAY=-1';
-    } else if (databaseType === H2_MEMORY) {
-      if (protocol === 'r2dbc') {
-        dbcUrl = `${protocol}:h2:mem:///${options.databaseName}`;
-      } else {
-        dbcUrl = `${protocol}:h2:mem:${options.databaseName}`;
-      }
-      extraOptions = ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE';
+    let databaseDataForType = databaseData[databaseType];
+    if (databaseDataForType[protocol]) {
+      databaseDataForType = {
+        ...databaseDataForType,
+        ...databaseDataForType[protocol],
+      };
+    }
+    const { protocolSuffix = '', extraOptions = '', useDirectory = false } = databaseDataForType;
+    let { port = '' } = databaseDataForType;
+    if (useDirectory && !options.localDirectory) {
+      throw new Error(`'localDirectory' option should be provided for ${databaseType} databaseType`);
+    }
+    const databaseHasHost = options.hostname;
+    if (options.itests && H2_MEMORY === databaseType) {
+      port = ':12344';
+    }
+    let url = `${protocol}:${protocolSuffix}`;
+    if (options.localDirectory) {
+      url += `${options.localDirectory}/`;
     } else {
-      throw new Error(`${databaseType} databaseType is not supported`);
+      url += databaseHasHost ? options.hostname : databaseName;
+      url += port;
     }
-
-    if (!options.skipExtraOptions && extraOptions) {
-      dbcUrl += extraOptions;
+    if (databaseHasHost || options.localDirectory) {
+      url += databaseName;
     }
-    return dbcUrl;
+    return `${url}${options.skipExtraOptions ? '' : extraOptions}`;
+  }
+
+  getDBCExtraOption(databaseType) {
+    const databaseDataForType = databaseData[databaseType];
+    const { extraOptions = '' } = databaseDataForType;
+    return extraOptions;
   }
 
   /**
    * Returns the primary key value based on the primary key type, DB and default value
    *
-   * @param {string} primaryKeyType - the primary key type
+   * @param {string} primaryKey - the primary key type
    * @param {string} databaseType - the database type
    * @param {string} defaultValue - default value
    * @returns {string} java primary key value
@@ -1550,7 +1602,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
    * Create a angular form path getter method of reference.
    *
    * @param {object} reference
-   * @param {string[]} valueDefinition
+   * @param {string[]} prefix
    * @return {string}
    */
   buildAngularFormPath(reference, prefix = []) {