generator-jhipster 8.9.0 → 8.11.0

package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs

@@ -2,7 +2,12 @@ import { computed, <% if (applicationTypeGateway && microfrontend) { %>defineAsy
 <%_ if (enableTranslation) { _%>
 import { useI18n } from 'vue-i18n';
 <%_ } _%>
+<%_ if (authenticationUsesCsrf) { _%>
 import type LoginService from '@/account/login.service';
+<%_ } %>
+<%_ if (generateUserManagement) { %>
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
 import type AccountService from '@/account/account.service';
 <%_ if (enableTranslation) { _%>
 import languages from '@/shared/config/languages';
@@ -30,7 +35,15 @@ export default defineComponent({
 <%_ } _%>
   },
   setup() {
+<%_ if (authenticationUsesCsrf) { _%>
     const loginService = inject<LoginService>('loginService');
+  <%_ if (authenticationTypeOauth2) { _%>
+    const { login } = loginService;
+  <%_ } %>
+<%_ } %>
+<%_ if (generateUserManagement) { %>
+    const { showLogin } = useLoginModal();
+<%_ } _%>
     const accountService = inject<AccountService>('accountService');
     const currentLanguage = inject('currentLanguage', () => computed(() => navigator.language ?? '<%- nativeLanguage %>'), true);
 <%_ if (enableTranslation) { _%>
@@ -51,14 +64,6 @@ export default defineComponent({
     const inProduction = computed(() => store.activeProfiles.indexOf('prod') > -1);
     const authenticated = computed(() => store.authenticated);
 
-    const openLogin = () => {
-<%_ if (!authenticationTypeOauth2) { _%>
-      loginService.openLogin();
-<%_ } else { %>
-      loginService.login();
-<%_ } _%>
-    };
-
     const subIsActive = (input: string | string[]) => {
       const paths = Array.isArray(input) ? input : [input];
       return paths.some(path => {
@@ -95,7 +100,7 @@ export default defineComponent({
       logout,
       subIsActive,
       accountService,
-      openLogin,
+      <% if (authenticationTypeOauth2) { %>login<% } else { %>showLogin<% } %>,
 <%_ if (enableTranslation) { _%>
       changeLanguage,
       languages: languages(),

package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs

@@ -152,7 +152,7 @@
             <font-awesome-icon icon="sign-out-alt" />
             <span v-text="t$('global.menu.account.logout')">Sign out</span>
           </b-dropdown-item>
-          <b-dropdown-item data-cy="login" v-if="!authenticated" @click="openLogin()" id="login" active-class="active">
+          <b-dropdown-item data-cy="login" v-if="!authenticated" @click="showLogin()" id="login" active-class="active">
             <font-awesome-icon icon="sign-in-alt" />
             <span v-text="t$('global.menu.account.login')">Sign in</span>
           </b-dropdown-item>

package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.service.ts.ejs

@@ -11,7 +11,7 @@ const baseSearchApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>/_search?query=
 
 export default class <%= entityAngularName %>Service {
 <%_ if (searchEngineAny) { _%>
-  public search(query<% if (!paginationNo) { %>, paginationQuery<% } %>) : Promise<any> {
+  search(query<% if (!paginationNo) { %>, paginationQuery<% } %>) : Promise<any> {
     return new Promise<any>((resolve, reject) => {
       axios.get(`${baseSearchApiUrl}${query}<% if (!paginationNo) { %>&${buildPaginationQueryOpts(paginationQuery)}<% } %>`).then(res => {
         resolve(<% if (!paginationNo) { %>res<% } else { %>res.data<% } %>);
@@ -20,7 +20,7 @@ export default class <%= entityAngularName %>Service {
   }
 <%_ } _%>
 
-  public find(<%= primaryKey.name %>: <%- primaryKey.tsType %>) : Promise<I<%= entityAngularName %>> {
+  find(<%= primaryKey.name %>: <%- primaryKey.tsType %>) : Promise<I<%= entityAngularName %>> {
     return new Promise<I<%= entityAngularName %>>((resolve, reject) => {
       axios.get(`${baseApiUrl}/${<%= primaryKey.name %>}`).then(res => {
         resolve(res.data);
@@ -28,7 +28,7 @@ export default class <%= entityAngularName %>Service {
     });
   }
 
-  public retrieve(<% if (!paginationNo) { %>paginationQuery?: any<% } %>) : Promise<any> {
+  retrieve(<% if (!paginationNo) { %>paginationQuery?: any<% } %>) : Promise<any> {
     return new Promise<any>((resolve, reject) => {
       axios.get(baseApiUrl<% if (!paginationNo) { %> + `?${buildPaginationQueryOpts(paginationQuery)}` <% } %>).then(res => {
         resolve(res);
@@ -37,7 +37,7 @@ export default class <%= entityAngularName %>Service {
   }
 <%_ if (!readOnly) { _%>
 
-  public delete(<%= primaryKey.name %>: <%- primaryKey.tsType %>) : Promise<any> {
+  delete(<%= primaryKey.name %>: <%- primaryKey.tsType %>) : Promise<any> {
     return new Promise<any>((resolve, reject) => {
       axios.delete(`${baseApiUrl}/${<%= primaryKey.name %>}`).then(res => {
         resolve(res);
@@ -45,7 +45,7 @@ export default class <%= entityAngularName %>Service {
     });
   }
 
-  public create(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
+  create(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
     return new Promise<I<%= entityAngularName %>>((resolve, reject) => {
       axios.post(`${baseApiUrl}`, entity).then(res => {
         resolve(res.data);
@@ -53,7 +53,7 @@ export default class <%= entityAngularName %>Service {
     });
   }
 
-  public update(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
+  update(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
     return new Promise<I<%= entityAngularName %>>((resolve, reject) => {
       axios.put(`${baseApiUrl}/${entity.<%= primaryKey.name %>}`, entity).then(res => {
         resolve(res.data);
@@ -61,7 +61,7 @@ export default class <%= entityAngularName %>Service {
     });
   }
 
-  public partialUpdate(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
+  partialUpdate(entity: I<%= entityAngularName %>) : Promise<I<%= entityAngularName %>> {
     return new Promise<I<%= entityAngularName %>>((resolve, reject) => {
       axios.patch(`${baseApiUrl}/${entity.<%= primaryKey.name %>}`, entity).then(res => {
         resolve(res.data);

package/dist/generators/vue/templates/src/main/webapp/app/entities/user/user.service.ts.ejs

@@ -3,7 +3,7 @@ import axios from 'axios';
 const baseApiUrl = 'api/users';
 
 export default class UserService {
-  public retrieve(): Promise<any> {
+  retrieve(): Promise<any> {
     return new Promise<any>((resolve, reject) => {
       axios
         .get(baseApiUrl)

package/dist/generators/vue/templates/src/main/webapp/app/locale/translation.service.ts.ejs

@@ -12,7 +12,7 @@ export default class TranslationService {
   }
 <%_ if (microfrontend) { _%>
 
-  public loadTranslations({ currentLanguage, urlPrefix, hash }: { currentLanguage: string; urlPrefix: string; hash: string }) {
+  loadTranslations({ currentLanguage, urlPrefix, hash }: { currentLanguage: string; urlPrefix: string; hash: string }) {
     if (!this.i18n) return;
     axios.get(`${urlPrefix}i18n/${currentLanguage}.json?_=${hash}`).then((res: any) => {
       if (res.data) {
@@ -22,7 +22,7 @@ export default class TranslationService {
   }
 <%_ } _%>
 
-  public async refreshTranslation(newLanguage: string) {
+  async refreshTranslation(newLanguage: string) {
     if (this.i18n && !this.i18n.messages[newLanguage]) {
 <%_ if (microfrontend) { _%>
       const res = await axios.get(`i18n/${newLanguage}.json?_=${I18N_HASH}`);
@@ -34,7 +34,7 @@ export default class TranslationService {
     }
   }
 
-  public setLocale(lang: string) {
+  setLocale(lang: string) {
     dayjs.locale(lang);
     this.i18n.locale.value = lang;
     axios.defaults.headers.common['Accept-Language'] = lang;
@@ -54,11 +54,11 @@ export default class TranslationService {
     }
 <%_ } _%>
 
-  public isLanguageSupported(lang: string) {
+  isLanguageSupported(lang: string) {
     return Boolean(this.languages[lang]);
   }
 
-  public getLocalStoreLanguage(): string | null {
+  getLocalStoreLanguage(): string | null {
     return localStorage.getItem('currentLanguage');
   }
 }

package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs

@@ -11,12 +11,17 @@ import { setupAxiosInterceptors } from '@/shared/config/axios-interceptor';
 
 import App from './app.vue';
 import router<% if (applicationTypeGateway && microfrontend) { %>, { lazyRoutes }<% } %> from './router';
-import { initFortAwesome<% if (enableTranslation) { %>, initI18N<% } %> } from './shared/config/config';
-import { initBootstrapVue } from './shared/config/config-bootstrap-vue';
-import JhiItemCountComponent from './shared/jhi-item-count.vue';
-import JhiSortIndicatorComponent from './shared/sort/jhi-sort-indicator.vue';
-import LoginService from './account/login.service';
-import AccountService from './account/account.service';
+import { initFortAwesome<% if (enableTranslation) { %>, initI18N<% } %> } from '@/shared/config/config';
+import { initBootstrapVue } from '@/shared/config/config-bootstrap-vue';
+import JhiItemCountComponent from '@/shared/jhi-item-count.vue';
+import JhiSortIndicatorComponent from '@/shared/sort/jhi-sort-indicator.vue';
+<%_ if (authenticationUsesCsrf) { _%>
+import LoginService from '@/account/login.service';
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+import { useLoginModal } from '@/account/login-modal';
+<%_ } _%>
+import AccountService from '@/account/account.service';
 
 import '../content/scss/global.scss';
 import '../content/scss/vendor.scss';
@@ -85,14 +90,12 @@ const i18n = initI18N();
 const app = createApp({
   compatConfig: { MODE: 3 },
   components: { App },
-  template: '<App/>',
-<%_ if (!authenticationTypeOauth2) { _%>
-  setup(_props, { emit }) {
-    const loginService = new LoginService({ emit });
-    provide('loginService', loginService);
-<%_ } else { _%>
   setup() {
+<%_ if (authenticationUsesCsrf) { _%>
     provide('loginService', new LoginService());
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+    const { hideLogin, showLogin } = useLoginModal();
 <%_ } _%>
     const store = useStore();
     const accountService = new AccountService(store);
@@ -143,7 +146,7 @@ const app = createApp({
     router.beforeResolve(async (to, from, next) => {
 <%_ if (!authenticationTypeOauth2) { _%>
       // Make sure login modal is closed
-      loginService.hideLogin();
+      hideLogin();
 
 <%_ } _%>
       if (!store.authenticated) {
@@ -173,7 +176,7 @@ const app = createApp({
 <%_ if (authenticationTypeOauth2) { _%>
             window.location.reload();
 <%_ } else { _%>
-            loginService.openLogin();
+            showLogin();
 <%_ } _%>
             return;
           }
@@ -205,6 +208,7 @@ const app = createApp({
     provide('microfrontendI18n', false);
 <%_ } _%>
   },
+  template: '<App/>',
 });
 
 initFortAwesome(app);

package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.ts.ejs

@@ -43,7 +43,7 @@ export default class AlertService {
 <%_ } _%>
   }
 
-  public showInfo(toastMessage: string, toastOptions?: any) {
+  showInfo(toastMessage: string, toastOptions?: any) {
     this.bvToast.toast(toastMessage, {
       toaster: 'b-toaster-top-center',
       title: 'Info',
@@ -54,7 +54,7 @@ export default class AlertService {
     });
   }
 
-  public showSuccess(toastMessage: string) {
+  showSuccess(toastMessage: string) {
     this.bvToast.toast(toastMessage, {
       toaster: 'b-toaster-top-center',
       title: 'Success',
@@ -64,7 +64,7 @@ export default class AlertService {
     });
   }
 
-  public showError(toastMessage: string) {
+  showError(toastMessage: string) {
     this.bvToast.toast(toastMessage, {
       toaster: 'b-toaster-top-center',
       title: 'Error',
@@ -74,7 +74,7 @@ export default class AlertService {
     });
   }
 
-  public showHttpError(httpErrorResponse: any) {
+  showHttpError(httpErrorResponse: any) {
     let errorMessage: string | null = null;
     switch (httpErrorResponse.status) {
       case 0:

package/dist/generators/workspaces/generator.d.ts

@@ -18,7 +18,13 @@
  */
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
 export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
-    [x: string]: any;
+    [BaseWorkspacesGenerator.INITIALIZING]: any;
+    [BaseWorkspacesGenerator.CONFIGURING]: any;
+    [BaseWorkspacesGenerator.COMPOSING]: any;
+    [BaseWorkspacesGenerator.LOADING]: any;
+    [BaseWorkspacesGenerator.LOADING_WORKSPACES]: any;
+    [BaseWorkspacesGenerator.WRITING]: any;
+    [BaseWorkspacesGenerator.POST_WRITING]: any;
     workspaces: boolean;
     generateApplications: () => Promise<undefined>;
     generateWith: string;

package/dist/generators/workspaces/support/applications-lookup.js

@@ -18,14 +18,14 @@
  */
 import { readFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
-import { globby } from 'globby';
+import { glob } from 'tinyglobby';
 const isApplication = async (cwd) => {
     const content = await readFile(cwd, { encoding: 'utf-8' });
     const jsonContent = JSON.parse(content);
     return Boolean(jsonContent?.['generator-jhipster']?.baseName);
 };
 export const applicationsLookup = async (cwd) => {
-    const yoRcFiles = await globby('**/.yo-rc.json', { cwd });
+    const yoRcFiles = await glob('**/.yo-rc.json', { cwd });
     const result = await Promise.all(yoRcFiles.map(async (file) => ({ file, isApp: await isApplication(file) })));
     return result.filter(({ isApp }) => isApp).map(({ file }) => dirname(file));
 };

package/dist/lib/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js

@@ -128,7 +128,7 @@ function convertAnnotationsToOptions(annotations) {
     const result = {};
     annotations.forEach(annotation => {
         const annotationName = lowerFirst(annotation.optionName);
-        const value = annotation.optionValue ? annotation.optionValue : true;
+        const value = annotation.optionValue ?? true;
         if (annotationName in result) {
             const previousValue = result[annotationName];
             if (Array.isArray(previousValue)) {

package/dist/lib/jdl/core/built-in-options/binary-options.d.ts

@@ -1,3 +1,12 @@
+declare const Options: {
+    DTO: string;
+    SERVICE: string;
+    PAGINATION: string;
+    MICROSERVICE: string;
+    SEARCH: string;
+    ANGULAR_SUFFIX: string;
+    CLIENT_ROOT_FOLDER: string;
+};
 declare function getOptionName(optionValue: any): string | undefined;
 declare function forEach(passedFunction: any): void;
 declare function exists(passedOption: any, passedValue?: any): boolean;
@@ -12,7 +21,9 @@ declare const _default: {
         CLIENT_ROOT_FOLDER: string;
     };
     DefaultValues: {
-        [x: string]: any;
+        [Options.DTO]: any;
+        [Options.SERVICE]: any;
+        [Options.PAGINATION]: any;
     };
     OptionValues: {
         mapstruct: string;

package/dist/lib/testing/apply-patch-to-template.d.ts

@@ -0,0 +1,13 @@
+type ApplyOptions = {
+    templateFile: string;
+    oldFileContents: string;
+    newFileContents: string;
+    contextSize?: number;
+    fuzzFactor?: number;
+};
+export declare const applyChangesToFile: ({ templateFile, oldFileContents, newFileContents, contextSize, fuzzFactor }: ApplyOptions) => {
+    success: number;
+    failures: number;
+};
+export declare const applyChangesToFileOrCopy: ({ templateFile, oldFileContents, ...opts }: ApplyOptions) => void;
+export {};

package/dist/lib/testing/apply-patch-to-template.js

@@ -0,0 +1,90 @@
+import { readFileSync, writeFileSync } from 'fs';
+import { applyPatch, structuredPatch } from 'diff';
+const splitHunk = ({ lines, ...hunk }, contextSize) => {
+    let contextLines = [];
+    // let nextHunkContextLines = [];
+    let hunkLines = [];
+    const hunks = [];
+    for (const line of lines) {
+        if (line.startsWith(' ')) {
+            contextLines.push(line);
+            if (contextLines.length >= contextSize && hunkLines.length > 0) {
+                hunks.push({ lines: [...hunkLines, ...contextLines], ...hunk });
+                hunkLines = [];
+            }
+        }
+        else {
+            hunkLines.push(...contextLines);
+            hunkLines.push(line);
+            contextLines = [];
+        }
+    }
+    if (hunkLines.length > 0) {
+        hunks.push({ lines: [...contextLines, ...hunkLines], ...hunk });
+    }
+    return hunks;
+};
+export const applyChangesToFile = ({ templateFile, oldFileContents, newFileContents, contextSize = 2, fuzzFactor = 0 }) => {
+    const patch = structuredPatch(templateFile, templateFile, oldFileContents, newFileContents, undefined, undefined, {
+        context: contextSize,
+        newlineIsToken: false,
+        // ignoreWhitespace: true,
+        // oneChangePerToken: true,
+        // maxEditLength: 3,
+    });
+    patch.hunks = patch.hunks
+        .map(({ lines, ...remainning }) => ({
+        ...remainning,
+        lines: lines
+            .map(line => (line === '-' ? ' ' : line.replace('-import', ' import').replace('+import', ' import')))
+            .filter(line => line !== '+'),
+    }))
+        .filter(({ lines }) => lines.some(line => line.startsWith('+') || line.startsWith('-')));
+    // apply hunk by hunk, since if a hunk fails, the rest of the file will be skipped
+    const content = readFileSync(templateFile, 'utf8').toString();
+    let applied = content;
+    let failures = 0;
+    let success = 0;
+    for (const hunk of patch.hunks.map(hunk => splitHunk(hunk, contextSize)).flat()) {
+        const result = applyPatch(applied, { ...patch, hunks: [hunk] }, { fuzzFactor });
+        if (result) {
+            applied = result;
+            success++;
+        }
+        else {
+            failures++;
+        }
+    }
+    if (content !== applied) {
+        writeFileSync(templateFile, applied);
+    }
+    return { success, failures };
+};
+export const applyChangesToFileOrCopy = ({ templateFile, oldFileContents, ...opts }) => {
+    const result = applyChangesToFile({ templateFile, oldFileContents, ...opts });
+    if (result.success === 0 && result.failures > 0) {
+        let diskContents;
+        if (templateFile.endsWith('.ejs')) {
+            diskContents = `<%#
+ Copyright 2013-2025 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.
+-%>
+${oldFileContents}`;
+        }
+        writeFileSync(templateFile, diskContents ?? oldFileContents, { encoding: 'utf-8' });
+    }
+};

package/dist/lib/testing/github.js

@@ -2,7 +2,6 @@ import { randomUUID } from 'node:crypto';
 import { appendFileSync, existsSync } from 'node:fs';
 import { EOL } from 'node:os';
 import process from 'node:process';
-import axios from 'axios';
 export const parseIssue = (issue) => {
     const result = /^(((?<owner>[^/]*)\/)?(?<repository>[^#]+)#)?(?<issue>\d+)$/.exec(issue);
     const groups = result?.groups;
@@ -29,13 +28,17 @@ export const setGithubTaskOutput = (name, value) => {
 };
 export const getGithubIssue = async ({ owner, repository, issue }) => {
     const token = process.env.GITHUB_TOKEN;
-    const response = await axios.get(`https://api.github.com/repos/${owner}/${repository}/issues/${issue}`, {
+    const response = await fetch(`https://api.github.com/repos/${owner}/${repository}/issues/${issue}`, {
+        method: 'GET',
         headers: {
             'X-GitHub-Api-Version': '2022-11-28',
             Authorization: token ? `Bearer ${token}` : undefined,
         },
     });
-    return response.data;
+    if (!response.ok) {
+        throw new Error(`Response status: ${response.status}`);
+    }
+    return await response.json();
 };
 export const getGithubSummaryFile = () => {
     const filePath = process.env.GITHUB_STEP_SUMMARY;

package/dist/lib/testing/helpers.d.ts

@@ -124,6 +124,7 @@ declare class JHipsterRunContext extends RunContext<GeneratorTestType> {
     withGradleBuildTool(): this;
     private withSharedData;
     run(): Promise<RunResult<GeneratorTestType>>;
+    withTask(priorityName: string, method: (...args: any[]) => any): this;
 }
 declare class JHipsterTest extends YeomanTest {
     constructor();

package/dist/lib/testing/helpers.js

@@ -1,4 +1,5 @@
 import assert from 'node:assert';
+import { randomInt } from 'node:crypto';
 import { basename, dirname, isAbsolute, join } from 'node:path';
 import { mock } from 'node:test';
 import { merge, set, snakeCase } from 'lodash-es';
@@ -337,6 +338,20 @@ plugins {
         };
         return runResult;
     }
+    withTask(priorityName, method) {
+        return this.onGenerator(async (gen) => {
+            const generator = gen;
+            generator.on('queueOwnTasks', () => {
+                const priority = generator._queues[priorityName];
+                const queueName = priority.queueName ?? priority.priorityName;
+                generator.queueTask({
+                    taskName: `test-task${randomInt(1000)}`,
+                    queueName,
+                    method,
+                });
+            });
+        });
+    }
 }
 class JHipsterTest extends YeomanTest {
     constructor() {