generator-jhipster 8.0.0-beta.2 → 8.0.0-beta.3

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs

@@ -11,7 +11,7 @@
   <%_ } else { _%>
     <property name="uuidType" value="uuid" dbms="h2"/>
   <%_ } _%>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
   <%_ if (prodDatabaseTypePostgres) { _%>
     <property name="clobType" value="longvarchar" dbms="h2"/>
   <%_ } else { _%>
@@ -19,7 +19,7 @@
   <%_ } _%>
     <property name="blobType" value="blob" dbms="h2"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
+<%_ if (prodDatabaseTypeMysql) { _%>
     <property name="now" value="now()" dbms="mysql"/>
     <property name="floatType" value="float" dbms="mysql"/>
     <property name="clobType" value="clob" dbms="mysql"/>
@@ -27,7 +27,7 @@
     <property name="uuidType" value="varchar(36)" dbms="mysql"/>
     <property name="datetimeType" value="datetime(6)" dbms="mysql"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
     <property name="now" value="now()" dbms="mariadb"/>
     <property name="floatType" value="float" dbms="mariadb"/>
     <property name="clobType" value="clob" dbms="mariadb"/>
@@ -35,7 +35,7 @@
     <property name="uuidType" value="varchar(36)" dbms="mariadb"/>
     <property name="datetimeType" value="datetime(6)" dbms="mariadb"/>
 <%_ } _%>
-<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
+<%_ if (prodDatabaseTypePostgres) { _%>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="floatType" value="float4" dbms="postgresql"/>
     <property name="clobType" value="clob" dbms="postgresql"/>
@@ -51,7 +51,7 @@
     <property name="uuidType" value="uuid" dbms="postgresql"/>
     <property name="datetimeType" value="datetime" dbms="postgresql"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
+<%_ if (prodDatabaseTypeOracle) { _%>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="floatType" value="float" dbms="oracle"/>
     <property name="clobType" value="clob" dbms="oracle"/>
@@ -59,7 +59,7 @@
     <property name="uuidType" value="uuid" dbms="oracle"/>
     <property name="datetimeType" value="datetime" dbms="oracle"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
+<%_ if (prodDatabaseTypeMssql) { _%>
     <property name="now" value="GETDATE()" dbms="mssql"/>
     <property name="floatType" value="float" dbms="mssql"/>
     <property name="clobType" value="clob" dbms="mssql"/>

package/dist/generators/maven/generator.mjs

@@ -26,14 +26,6 @@ import cleanupOldServerFilesTask from './cleanup.mjs';
 import { createPomStorage } from './support/index.mjs';
 export default class MavenGenerator extends BaseApplicationGenerator {
     pomStorage;
-    constructor(args, options, features) {
-        super(args, options, features);
-        if (this.options.help)
-            return;
-        this.config.defaults({
-            buildTool: MAVEN,
-        });
-    }
     async beforeQueue() {
         this.pomStorage = createPomStorage(this);
         if (!this.fromBlueprint) {
@@ -41,6 +33,20 @@ export default class MavenGenerator extends BaseApplicationGenerator {
             await this.composeWithBlueprints(GENERATOR_MAVEN);
         }
     }
+    get configuring() {
+        return this.asConfiguringTaskGroup({
+            configure() {
+                if (this.jhipsterConfigWithDefaults.buildTool !== MAVEN) {
+                    this.config.defaults({
+                        buildTool: MAVEN,
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING]() {
+        return this.delegateTasksToBlueprint(() => this.configuring);
+    }
     get preparing() {
         return this.asPreparingTaskGroup({
             async verify({ application }) {

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

package/dist/generators/needle-api.mjs

@@ -21,8 +21,6 @@ import Client from './client/needle-api/needle-client.mjs';
 import ClientAngular from './angular/needle-api/needle-client-angular.mjs';
 import ClientReact from './react/needle-api/needle-client-react.mjs';
 import ClientVue from './client/needle-api/needle-client-vue.mjs';
-import ClientWebpack from './client/needle-api/needle-client-webpack.mjs';
-import ClientI18n from './client/needle-api/needle-client-i18n.mjs';
 export default class NeedleApi {
     constructor(generator) {
         this.base = new Base(generator);
@@ -30,7 +28,5 @@ export default class NeedleApi {
         this.clientAngular = new ClientAngular(generator);
         this.clientReact = new ClientReact(generator);
         this.clientVue = new ClientVue(generator);
-        this.clientWebpack = new ClientWebpack(generator);
-        this.clientI18n = new ClientI18n(generator);
     }
 }

package/dist/generators/openapi-client/files.mjs

@@ -23,6 +23,7 @@ import { SERVER_MAIN_SRC_DIR, OPENAPI_GENERATOR_CLI_VERSION } from '../generator
 import { applicationOptions, buildToolTypes, applicationTypes, authenticationTypes } from '../../jdl/jhipster/index.mjs';
 import { addGradleDependencyCallback, addGradlePropertyCallback } from '../gradle/internal/needles.mjs';
 import { getPomVersionProperties } from '../server/support/dependabot-maven.mjs';
+import { getMainClassName } from '../java/support/index.mjs';
 const { OptionNames } = applicationOptions;
 const { GRADLE, MAVEN } = buildToolTypes;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
@@ -156,7 +157,7 @@ export function customizeFiles() {
                 return;
             }
             this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-            const mainClassFile = `${this.javaDir + this.getMainClassName()}.java`;
+            const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
             if (this.applicationType !== MICROSERVICE || ![JWT].includes(this.authenticationType)) {
                 this.rewriteFile(mainClassFile, 'import org.springframework.core.env.Environment;', 'import org.springframework.cloud.openfeign.EnableFeignClients;');
                 this.rewriteFile(mainClassFile, '@SpringBootApplication', '@EnableFeignClients');
@@ -167,7 +168,7 @@ export function customizeFiles() {
                 return;
             }
             this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-            const mainClassFile = `${this.javaDir + this.getMainClassName()}.java`;
+            const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
             this.rewriteFile(mainClassFile, 'import org.springframework.core.env.Environment;', 'import org.springframework.context.annotation.ComponentScan;\nimport org.springframework.context.annotation.FilterType;');
             const componentScan = '@ComponentScan( excludeFilters = {\n' +
                 '   @ComponentScan.Filter(type = FilterType.REGEX, ' +

package/dist/generators/openapi-client/generator.mjs

@@ -25,6 +25,9 @@ import { askActionType, askExistingAvailableDocs, askGenerationInfos } from './p
 import { writeFiles, customizeFiles } from './files.mjs';
 import { openapiOptions } from '../../jdl/jhipster/index.mjs';
 import { createPomStorage } from '../maven/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
+import { loadLanguagesConfig } from '../languages/support/index.mjs';
 const { OpenAPIOptionsNames, OpenAPIDefaultValues } = openapiOptions;
 export default class OpenapiClientGenerator extends BaseGenerator {
     constructor(args, options, features) {
@@ -49,12 +52,13 @@ export default class OpenapiClientGenerator extends BaseGenerator {
             },
             getConfig() {
                 this.openApiClients = this.config.get('openApiClients') || {};
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadTranslationConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadLanguagesConfig({ application: this, config: this.jhipsterConfigWithDefaults });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
         };
     }
@@ -127,7 +131,7 @@ export default class OpenapiClientGenerator extends BaseGenerator {
                     const generatorName = this.clientsToGenerate[cliName].generatorName;
                     const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} run openapi-client:${cliName}`, { silent: this.silent });
                     if (!stderr) {
-                        this.success(`Succesfully generated ${cliName} ${generatorName} client`);
+                        this.log.ok(`Succesfully generated ${cliName} ${generatorName} client`);
                     }
                     else {
                         this.log.error(`Something went wrong while generating client ${cliName}: ${stdout} ${stderr}`);
@@ -178,4 +182,17 @@ export default class OpenapiClientGenerator extends BaseGenerator {
             additionalContent: other,
         });
     }
+    /**
+     * @private
+     * Rewrite the specified file with provided content at the needle location
+     *
+     * @param {string} filePath - path of the source file to rewrite
+     * @param {string} needle - needle to look for where content will be inserted
+     * @param {string} content - content to be written
+     * @returns {boolean} true if the body has changed.
+     */
+    rewriteFile(filePath, needle, content) {
+        const rewriteFileModel = this.needleApi.base.generateFileModel(filePath, needle, content);
+        return this.needleApi.base.addBlockContentToFile(rewriteFileModel);
+    }
 }

package/dist/generators/openshift/generator.mjs

@@ -20,14 +20,19 @@
 import chalk from 'chalk';
 import shelljs from 'shelljs';
 import runAsync from 'run-async';
-import BaseDockerGenerator from '../base-docker/index.mjs';
+import BaseWorkspacesGenerator from '../base-workspaces/index.mjs';
 import prompts from './prompts.mjs';
 import { GENERATOR_OPENSHIFT } from '../generator-list.mjs';
-import { loadFromYoRc, checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } from '../base-docker/docker-base.mjs';
+import { loadFromYoRc, checkImages, generateJwtSecret, configureImageNames } from '../base-workspaces/internal/docker-base.mjs';
 import { setupKubernetesConstants } from '../kubernetes/kubernetes-base.mjs';
 import statistics from '../statistics.mjs';
 import { applicationTypes, databaseTypes, messageBrokerTypes, monitoringTypes, openshiftPlatformTypes, searchEngineTypes, serviceDiscoveryTypes, } from '../../jdl/jhipster/index.mjs';
 import { writeFiles } from './files.mjs';
+import { getJdbcUrl } from '../spring-data-relational/support/index.mjs';
+import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.mjs';
+import { checkDocker } from '../docker/support/index.mjs';
+import { loadDerivedServerConfig } from '../server/support/index.mjs';
+import { loadDerivedAppConfig } from '../app/support/index.mjs';
 const { KAFKA } = messageBrokerTypes;
 const { PROMETHEUS } = monitoringTypes;
 const { ELASTICSEARCH } = searchEngineTypes;
@@ -40,9 +45,9 @@ const { EPHEMERAL, PERSISTENT } = StorageTypes;
 /* eslint-disable consistent-return */
 /**
  * @class
- * @extends {BaseDockerGenerator}
+ * @extends {BaseWorkspacesGenerator}
  */
-export default class OpenshiftGenerator extends BaseDockerGenerator {
+export default class OpenshiftGenerator extends BaseWorkspacesGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
@@ -54,7 +59,8 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
                 this.log.log(chalk.white(`${chalk.bold('⭕')} [*BETA*] Welcome to the JHipster OpenShift Generator ${chalk.bold('⭕')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())} or in the root directory path that you select in the subsequent step`));
             },
-            ...super.initializing,
+            loadDockerDependenciesTask,
+            checkDocker,
             checkOpenShift: runAsync(function () {
                 if (this.skipChecks)
                     return;
@@ -77,7 +83,7 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             setupKubernetesConstants,
         };
     }
-    get [BaseDockerGenerator.INITIALIZING]() {
+    get [BaseWorkspacesGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
     get prompting() {
@@ -94,7 +100,7 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             askForDockerPushCommand: prompts.askForDockerPushCommand,
         };
     }
-    get [BaseDockerGenerator.PROMPTING]() {
+    get [BaseWorkspacesGenerator.PROMPTING]() {
         return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
@@ -105,7 +111,6 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             checkImages,
             generateJwtSecret,
             configureImageNames,
-            setAppsFolderPaths,
             // place holder for future changes (may be prompt or something else)
             setRegistryReplicas() {
                 this.registryReplicas = 2;
@@ -136,30 +141,28 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             },
         };
     }
-    get [BaseDockerGenerator.CONFIGURING]() {
+    get [BaseWorkspacesGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get loading() {
         return {
             loadSharedConfig() {
                 this.appConfigs.forEach(element => {
-                    this.loadAppConfig(element, element);
-                    this.loadServerConfig(element, element);
-                    this.loadDerivedAppConfig(element);
-                    this.loadDerivedServerConfig(element);
+                    loadDerivedAppConfig({ application: element });
+                    loadDerivedServerConfig({ application: element });
                 });
-                this.loadDeploymentConfig(this);
+                loadDeploymentConfig.call(this);
                 this._loadDerivedOpenshiftConfig(this);
             },
         };
     }
-    get [BaseDockerGenerator.LOADING]() {
+    get [BaseWorkspacesGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
     get writing() {
         return writeFiles();
     }
-    get [BaseDockerGenerator.WRITING]() {
+    get [BaseWorkspacesGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get end() {
@@ -224,11 +227,21 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             },
         };
     }
-    get [BaseDockerGenerator.END]() {
+    get [BaseWorkspacesGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);
     }
     _loadDerivedOpenshiftConfig(dest = this) {
         dest.storageTypeEphemeral = dest.storageType === EPHEMERAL;
         dest.storageTypePersistent = dest.storageType === PERSISTENT;
     }
+    /**
+     * @private
+     * Returns the JDBC URL for a databaseType
+     *
+     * @param {string} databaseType
+     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
+     */
+    getJDBCUrl(databaseType, options = {}) {
+        return getJdbcUrl(databaseType, options);
+    }
 }

package/dist/generators/openshift/prompts.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { databaseTypes, monitoringTypes, searchEngineTypes, openshiftPlatformTypes } from '../../jdl/jhipster/index.mjs';
-import dockerPrompts from '../base-docker/docker-prompts.mjs';
+import dockerPrompts from '../base-workspaces/internal/docker-prompts.mjs';
 const { ELASTICSEARCH } = searchEngineTypes;
 const { PROMETHEUS } = monitoringTypes;
 const { StorageTypes } = openshiftPlatformTypes;
@@ -46,7 +46,7 @@ export async function askForStorageType() {
     if (this.regenerate)
         return;
     let storageEnabled = false;
-    this.appConfigs.some((appConfig, index) => {
+    this.appConfigs.some(appConfig => {
         if (appConfig.prodDatabaseType !== NO_DATABASE || appConfig.searchEngine === ELASTICSEARCH || appConfig.monitoring === PROMETHEUS) {
             storageEnabled = true;
             return storageEnabled;

package/dist/generators/page/generator.mjs

@@ -50,7 +50,6 @@ export default class PageGenerator extends BaseApplicationGenerator {
         }
         this.pageName = this.options.pageName;
         this.page = this.options.page || {};
-        this.loadRuntimeOptions();
     }
     async beforeQueue() {
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);

package/dist/generators/project-name/generator.mjs

@@ -36,10 +36,7 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
             }
         }
         this.sharedData.getControl().existingProject =
-            this.options.defaults ||
-                this.options.withEntities ||
-                this.options.applicationWithConfig ||
-                (this.jhipsterConfig.baseName !== undefined && this.config.existed);
+            this.options.defaults || this.options.applicationWithConfig || (this.jhipsterConfig.baseName !== undefined && this.config.existed);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_PROJECT_NAME);
         }

package/dist/generators/project-name/support/name-resolver.mjs

@@ -20,7 +20,7 @@ import path from 'path';
 import { isReproducible } from '../../base/support/index.mjs';
 const getDefaultName = generator => {
     const defaultName = 'jhipster';
-    if (isReproducible(generator)) {
+    if (generator && isReproducible(generator)) {
         return defaultName;
     }
     return /^[a-zA-Z0-9_-]+$/.test(path.basename(process.cwd()))

package/dist/generators/react/entity-files-react.mjs

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
 export const reactFiles = {
     client: [
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'entities/_entityFolder/_entityFile-detail.tsx',
                 'entities/_entityFolder/_entityFile.tsx',
@@ -30,20 +30,20 @@ export const reactFiles = {
             ],
         },
         {
-            ...clientApplicationBlock,
-            renameTo: (data, filepath) => `${data.clientSrcDir}app/shared/model/${data.entityModelFileName}.model.ts`,
+            ...clientApplicationTemplatesBlock(),
+            renameTo: data => `${data.clientSrcDir}app/shared/model/${data.entityModelFileName}.model.ts`,
             templates: ['entities/_entityFolder/_entityModel.model.ts'],
         },
         {
             condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['entities/_entityFolder/_entityFile-delete-dialog.tsx', 'entities/_entityFolder/_entityFile-update.tsx'],
         },
     ],
     test: [
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['entities/_entityFolder/_entityFile-reducer.spec.ts'],
         },
     ],