generator-jhipster 8.2.0 → 8.3.0

package/dist/generators/java/generators/node/generator.js

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import BaseApplicationGenerator from '../../../base-application/index.js';
+export default class NodeGenerator extends BaseApplicationGenerator {
+    async beforeQueue() {
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints();
+        }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnBootstrapApplication();
+            await this.dependsOnJHipster('jhipster:java:build-tool');
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get prompting() {
+        return this.asPromptingTaskGroup({
+            async promptCommand({ control }) {
+                if (control.existingProject && this.options.askAnswered !== true)
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+    }
+    get [BaseApplicationGenerator.PROMPTING]() {
+        return this.delegateTasksToBlueprint(() => this.prompting);
+    }
+    get composing() {
+        return this.asComposingTaskGroup({
+            async compose() {
+                const { buildTool } = this.jhipsterConfigWithDefaults;
+                if (buildTool === 'maven') {
+                    await this.composeWithJHipster('jhipster:maven:frontend-plugin');
+                }
+                else if (buildTool === 'gradle') {
+                    await this.composeWithJHipster('jhipster:gradle:node-gradle');
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING]() {
+        return this.delegateTasksToBlueprint(() => this.composing);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadConfig({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
+    get writing() {
+        return this.asWritingTaskGroup({
+            async writing({ application }) {
+                await this.writeFiles({
+                    blocks: [
+                        {
+                            condition: (ctx) => ctx.useNpmWrapper,
+                            transform: false,
+                            templates: ['npmw', 'npmw.cmd'],
+                        },
+                    ],
+                    context: application,
+                });
+            },
+        });
+    }
+    get [BaseApplicationGenerator.WRITING]() {
+        return this.delegateTasksToBlueprint(() => this.writing);
+    }
+}

package/dist/generators/java/generators/node/index.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/java/support/index.js

@@ -25,5 +25,6 @@ export { default as generatedAnnotationTransform } from './generated-annotation-
 export * from './java-formatting.js';
 export * from './key-store.js';
 export { default as packageInfoTransform } from './package-info-transform.js';
+export * from './package-info-transform.js';
 export * from './reserved-keywords.js';
 export * from './util.js';

package/dist/generators/jdl/generator.js

@@ -17,12 +17,11 @@
  * limitations under the License.
  */
 import { extname } from 'path';
-import * as _ from 'lodash-es';
+import { upperFirst } from 'lodash-es';
 import { create as createMemFs } from 'mem-fs';
 import { create as createMemFsEditor } from 'mem-fs-editor';
 import { readFile } from 'fs/promises';
 import BaseGenerator from '../base/index.js';
-import command from './command.js';
 import { downloadJdlFile } from '../../cli/download.mjs';
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
 import { CLI_NAME } from '../../cli/utils.mjs';
@@ -34,7 +33,6 @@ import { addApplicationIndex, allNewApplications, customizeForMicroservices } fr
 import { mergeYoRcContent } from '../../jdl/index.js';
 import { normalizeBlueprintName } from '../base/internal/blueprint.js';
 import { updateApplicationEntitiesTransform } from '../base-application/support/update-application-entities-transform.js';
-const { upperFirst } = _;
 /**
  * Add jdl extension to the file
  */
@@ -66,25 +64,24 @@ export default class JdlGenerator extends BaseGenerator {
     exportedDeployments;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints('jdl');
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
             loadArguments() {
-                this.parseJHipsterArguments(command.arguments);
                 if (this.jdlFiles) {
                     this.log.verboseInfo('Generating jdls', ...this.jdlFiles);
                 }
             },
-            loadOptions() {
-                this.parseJHipsterOptions(command.options);
-            },
             existingProject() {
                 this.existingProject = this.jhipsterConfig.baseName !== undefined && this.config.existed;
             },
             checkOptions() {
-                if (!this.inline && !this.jdlFiles?.length) {
+                if (!this.skipChecks && !this.inline && !this.jdlFiles?.length) {
                     throw new Error('At least one jdl file is required.');
                 }
             },

package/dist/generators/kubernetes/generator.js

@@ -41,7 +41,7 @@ const { MAVEN } = buildToolTypes;
 export default class KubernetesGenerator extends BaseWorkspacesGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_KUBERNETES);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {

package/dist/generators/kubernetes/kubernetes-base.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import crypto from 'crypto';
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import { defaultKubernetesConfig } from './kubernetes-constants.js';
 import { loadFromYoRc } from '../base-workspaces/internal/docker-base.js';
 import { KUBERNETES_CORE_API_VERSION, KUBERNETES_BATCH_API_VERSION, KUBERNETES_DEPLOYMENT_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, KUBERNETES_INGRESS_API_VERSION, KUBERNETES_ISTIO_NETWORKING_API_VERSION, KUBERNETES_RBAC_API_VERSION, HELM_KAFKA, HELM_ELASTICSEARCH, HELM_PROMETHEUS, HELM_GRAFANA, HELM_MARIADB, HELM_MYSQL, HELM_POSTGRESQL, HELM_MONGODB_REPLICASET, HELM_COUCHBASE_OPERATOR, } from '../generator-constants.js';
@@ -54,7 +54,7 @@ export function loadConfig() {
     if (!this.jhipsterConfig.dbRandomPassword) {
         this.jhipsterConfig.dbRandomPassword = this.options.reproducibleTests ? 'SECRET-PASSWORD' : crypto.randomBytes(30).toString('hex');
     }
-    const kubernetesWithDefaults = _.defaults({}, this.jhipsterConfig, defaultKubernetesConfig);
+    const kubernetesWithDefaults = defaults({}, this.jhipsterConfig, defaultKubernetesConfig);
     this.kubernetesNamespace = kubernetesWithDefaults.kubernetesNamespace;
     this.kubernetesServiceType = kubernetesWithDefaults.kubernetesServiceType;
     this.ingressType = kubernetesWithDefaults.ingressType;
@@ -66,7 +66,7 @@ export function loadConfig() {
     this.generatorType = kubernetesWithDefaults.generatorType;
 }
 export function saveConfig() {
-    this.config.set(_.defaults({
+    this.config.set(defaults({
         appsFolders: this.appsFolders,
         directoryPath: this.directoryPath,
         clusteredDbApps: this.clusteredDbApps,

package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs

@@ -1855,22 +1855,6 @@ data:
           "topLevel": false,
           "builtIn": true,
           "authenticationExecutions": [
-            {
-              "authenticator": "basic-auth",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 10,
-              "userSetupAllowed": false,
-              "autheticatorFlow": false
-            },
-            {
-              "authenticator": "basic-auth-otp",
-              "authenticatorFlow": false,
-              "requirement": "DISABLED",
-              "priority": 20,
-              "userSetupAllowed": false,
-              "autheticatorFlow": false
-            },
             {
               "authenticator": "auth-spnego",
               "authenticatorFlow": false,
@@ -2261,14 +2245,6 @@ data:
           "topLevel": true,
           "builtIn": true,
           "authenticationExecutions": [
-            {
-              "authenticator": "no-cookie-redirect",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 10,
-              "userSetupAllowed": false,
-              "autheticatorFlow": false
-            },
             {
               "authenticatorFlow": true,
               "requirement": "REQUIRED",
@@ -2314,14 +2290,6 @@ data:
               "userSetupAllowed": false,
               "autheticatorFlow": false
             },
-            {
-              "authenticator": "registration-profile-action",
-              "authenticatorFlow": false,
-              "requirement": "REQUIRED",
-              "priority": 40,
-              "userSetupAllowed": false,
-              "autheticatorFlow": false
-            },
             {
               "authenticator": "registration-password-action",
               "authenticatorFlow": false,

package/dist/generators/kubernetes-helm/generator.js

@@ -40,7 +40,7 @@ const { KAFKA } = messageBrokerTypes;
 export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_KUBERNETES_HELM);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {

package/dist/generators/kubernetes-knative/generator.js

@@ -43,7 +43,7 @@ const { K8S } = GeneratorTypes;
 export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_KUBERNETES_KNATIVE);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {

package/dist/generators/languages/entity-files.js

@@ -59,8 +59,9 @@ export const enumClientI18nFiles = {
 export function writeEntityFiles() {
     return {
         async writeEnumFiles({ entities, application }) {
-            if (!application.enableTranslation || application.skipClient)
+            if (application.skipClient)
                 return;
+            const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])];
             entities = entities.filter(entity => !entity.skipClient && !entity.builtInUser);
             const { clientSrcDir, packageName, frontendAppName } = application;
             await Promise.all(entities
@@ -68,7 +69,7 @@ export function writeEntityFiles() {
                 .map(field => {
                 if (!field.fieldIsEnum)
                     return undefined;
-                return this.languagesToApply.map(lang => this.writeFiles({
+                return languagesToApply.map(lang => this.writeFiles({
                     sections: enumClientI18nFiles,
                     context: {
                         ...getEnumInfo(field, entity.clientRootFolder),

package/dist/generators/languages/generator.js

@@ -18,11 +18,11 @@
  */
 /* eslint-disable consistent-return */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { padEnd, startCase } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { askForLanguages, askI18n } from './prompts.js';
 import statistics from '../statistics.js';
-import { GENERATOR_LANGUAGES, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
+import { GENERATOR_LANGUAGES } from '../generator-list.js';
 import { clientI18nFiles } from './files.js';
 import { writeEntityFiles } from './entity-files.js';
 import TranslationData, { createTranslationsFileFilter, createTranslationsFilter } from './translation-data.js';
@@ -32,10 +32,8 @@ import { updateLanguagesTask as updateLanguagesInReact } from '../react/support/
 import { updateLanguagesTask as updateLanguagesInVue } from '../vue/support/index.js';
 import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/index.js';
 import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js';
-import command from './command.js';
 import { QUEUES } from '../base-application/priorities.js';
 import { PRIORITY_NAMES } from '../base/priorities.js';
-const { startCase } = _;
 /**
  * This is the base class for a generator that generates entities.
  *
@@ -62,10 +60,10 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         this.supportedLanguages = supportedLanguages;
         if (!this.fromBlueprint) {
-            this.composedBlueprints = await this.composeWithBlueprints('languages');
+            this.composedBlueprints = await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
         if (!this.jhipsterConfigWithDefaults.skipClient &&
             this.jhipsterConfigWithDefaults.clientFramework !== 'no' &&
@@ -79,9 +77,8 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get initializing() {
         return this.asInitializingTaskGroup({
-            parseCli() {
-                this.parseJHipsterArguments(command.arguments);
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
             languagesToApply() {
                 // Validate languages passed as argument.
@@ -99,7 +96,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
                     if (unsupportedLanguage) {
                         throw new Error(`Unsupported language "${unsupportedLanguage}" passed as argument to language generator.` +
                             `\nSupported languages: ${this.supportedLanguages
-                                .map(language => `\n  ${_.padEnd(language.languageTag, 5)} (${language.name})`)
+                                .map(language => `\n  ${padEnd(language.languageTag, 5)} (${language.name})`)
                                 .join('')}`);
                     }
                 }

package/dist/generators/languages/support/translate.js

@@ -17,17 +17,19 @@
  * limitations under the License.
  */
 const TRANSLATE_FUNCTION_ARGS = /\(\s*'(?<key>[^']+)'(?:,\s*(?<interpolate>\{(?:(?!\}\))[\s\S])*\}))?\)/gs.source;
+export const escapeHtmlTranslationValue = (translation) => translation.replace(/'/g, '&apos;').replace(/"/g, '&quot;').replace(/@/g, '&#64;');
+export const escapeTsTranslationValue = (translation) => translation.replace(/'/g, "\\'").replace(/\\/g, '\\\\');
 function getTranslationValue(getWebappTranslation, key, data) {
     return getWebappTranslation(key, data) || undefined;
 }
 export const replaceTranslationKeysWithText = (getWebappTranslation, body, regexp, { keyPattern, interpolatePattern, wrapTranslation, escapeHtml, stringify } = {}) => {
-    const matches = body.matchAll(new RegExp(regexp, 'g'));
+    const matches = [...body.matchAll(new RegExp(regexp, 'g'))].reverse();
     if (typeof wrapTranslation === 'string') {
         wrapTranslation = [wrapTranslation, wrapTranslation];
     }
     for (const match of matches) {
         const target = match[0];
-        let key = match?.groups?.key;
+        let key = match.groups?.key;
         if (!key && keyPattern) {
             const keyMatch = target.match(new RegExp(keyPattern));
             key = keyMatch?.groups?.key;
@@ -35,7 +37,7 @@ export const replaceTranslationKeysWithText = (getWebappTranslation, body, regex
         if (!key) {
             throw new Error(`Translation key not found for ${target}`);
         }
-        let interpolate = match.groups && match.groups.interpolate;
+        let interpolate = match.groups?.interpolate;
         if (!interpolate && interpolatePattern) {
             const interpolateMatch = target.match(new RegExp(interpolatePattern));
             interpolate = interpolateMatch?.groups?.interpolate;
@@ -44,10 +46,7 @@ export const replaceTranslationKeysWithText = (getWebappTranslation, body, regex
         if (interpolate) {
             data = {};
             try {
-                const interpolateValues = JSON.parse(interpolate);
-                for (const [field, value] of Object.entries(interpolateValues)) {
-                    data[field] = value;
-                }
+                data = JSON.parse(interpolate);
             }
             catch {
                 throw new Error(`Translation interpolations values should be a JSON, ${interpolate}`);
@@ -63,12 +62,12 @@ export const replaceTranslationKeysWithText = (getWebappTranslation, body, regex
         }
         else if (escapeHtml) {
             // Escape specific chars
-            replacement = replacement.replace(/'/g, '&apos;').replace(/"/g, '&quot;').replace(/@/g, '&#64;');
+            replacement = escapeHtmlTranslationValue(replacement);
         }
         else if (stringify) {
             replacement = JSON.stringify(replacement);
         }
-        body = body.replace(target, replacement);
+        body = `${body.slice(0, match.index)}${replacement}${body.slice(match.index + target.length)}`;
     }
     return body;
 };
@@ -76,3 +75,29 @@ export const createJhiTransformTranslateReplacer = (getWebappTranslation, transl
 export const createJhiTransformTranslateStringifyReplacer = getWebappTranslation => (body) => replaceTranslationKeysWithText(getWebappTranslation, body, `__jhiTransformTranslateStringify__${TRANSLATE_FUNCTION_ARGS}`, {
     stringify: true,
 });
+export const replaceTranslateContents = (body, filePath, regexp, converter) => {
+    const matches = [...body.matchAll(new RegExp(regexp, 'g'))].reverse();
+    for (const match of matches) {
+        const target = match[0];
+        const { key, interpolate, type, prefix = '', suffix = '' } = match.groups ?? {};
+        if (!type) {
+            throw new Error(`Translation type not found for ${target}`);
+        }
+        if (!key) {
+            throw new Error(`Translation key not found for ${target}`);
+        }
+        let parsedInterpolate;
+        if (interpolate) {
+            parsedInterpolate = {};
+            try {
+                parsedInterpolate = JSON.parse(interpolate);
+            }
+            catch {
+                throw new Error(`Translation interpolations values should be a JSON, ${interpolate}`);
+            }
+        }
+        body = `${body.slice(0, match.index)}${converter({ filePath, key, interpolate, parsedInterpolate, type, prefix, suffix })}${body.slice(match.index + target.length)}`;
+    }
+    return body;
+};
+export const createJhiTranslateReplacer = (converter, { prefixPattern = '', suffixPattern = '' } = {}) => (body, filePath) => replaceTranslateContents(body, filePath, `${prefixPattern ? `(?<prefix>(${prefixPattern}))?` : ''}__jhiTranslate(?<type>(\\w+))__${TRANSLATE_FUNCTION_ARGS}${suffixPattern ? `(?<suffix>(${suffixPattern}))?` : ''}`, converter);

package/dist/generators/languages/translation-data.js

@@ -17,10 +17,9 @@
  * limitations under the License.
  */
 import { inspect } from 'node:util';
-import * as _ from 'lodash-es';
+import { defaultsDeep, get, merge, template } from 'lodash-es';
 import { transform } from '@yeoman/transform';
 import { Minimatch } from 'minimatch';
-const { get } = _;
 export const createTranslationsFilter = ({ clientSrcDir, nativeLanguage, fallbackLanguage }) => {
     const pattern = !fallbackLanguage || nativeLanguage === fallbackLanguage
         ? `**/${clientSrcDir}i18n/${nativeLanguage}/*.json`
@@ -57,10 +56,10 @@ export default class TranslationData {
     }
     mergeTranslation(translation, fallback) {
         if (fallback) {
-            _.defaultsDeep(this.translations, translation);
+            defaultsDeep(this.translations, translation);
         }
         else {
-            _.merge(this.translations, translation);
+            merge(this.translations, translation);
         }
     }
     /**
@@ -90,7 +89,7 @@ export default class TranslationData {
         if (translatedValue.includes('{{ login }}') && !data.login) {
             data.login = data.id;
         }
-        const compiledTemplate = _.template(translatedValue, { interpolate: /{{([\s\S]+?)}}/g });
+        const compiledTemplate = template(translatedValue, { interpolate: /{{([\s\S]+?)}}/g });
         return compiledTemplate(data);
     }
 }