generator-jhipster 8.7.0 → 8.7.2

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs

@@ -91,7 +91,7 @@ describe('<%= entityAngularName %> routing resolve service', () => {
       });
 
       // THEN
-      expect(service.find).not.toBeCalled();
+      expect(service.find).not.toHaveBeenCalled();
       expect(result<%= entityAngularName %>).toEqual(null);
     });
 

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

@@ -84,8 +84,8 @@ export type EntityArrayResponseType = HttpResponse<I<%= entityAngularName %>[]>;
 
 @Injectable({ providedIn: 'root' })
 export class <%= entityAngularName %>Service {
-    protected http = inject(HttpClient);
-    protected applicationConfigService = inject(ApplicationConfigService);
+    protected readonly http = inject(HttpClient);
+    protected readonly applicationConfigService = inject(ApplicationConfigService);
 
     protected resourceUrl = this.applicationConfigService.getEndpointFor('api/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
 <%_ if (searchEngineAny) { _%>

package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.ts.ejs

@@ -49,11 +49,11 @@ export default class HomeComponent implements OnInit<% if (!authenticationTypeOa
   private readonly destroy$ = new Subject<void>();
 <%_ } _%>
 
-  private accountService = inject(AccountService);
+  private readonly accountService = inject(AccountService);
 <%_ if (!authenticationTypeOauth2) { _%>
-  private router = inject(Router);
+  private readonly router = inject(Router);
 <%_ } else { _%>
-  private loginService = inject(LoginService);
+  private readonly loginService = inject(LoginService);
 <%_ } _%>
 
   ngOnInit(): void {

package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs

@@ -40,18 +40,18 @@ import PageRibbonComponent from '../profiles/page-ribbon.component';
 })
 export default class MainComponent implements OnInit {
 <%_ if (enableTranslation) { _%>
-  private renderer: Renderer2;
+  private readonly renderer: Renderer2;
 <%_ } _%>
 
-  private router = inject(Router);
-  private appPageTitleStrategy = inject(AppPageTitleStrategy);
-  private accountService = inject(AccountService);
+  private readonly router = inject(Router);
+  private readonly appPageTitleStrategy = inject(AppPageTitleStrategy);
+  private readonly accountService = inject(AccountService);
 <%_ if (enableI18nRTL) { _%>
-  private findLanguageFromKeyPipe = inject(FindLanguageFromKeyPipe);
+  private readonly findLanguageFromKeyPipe = inject(FindLanguageFromKeyPipe);
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
-  private translateService = inject(TranslateService);
-  private rootRenderer = inject(RendererFactory2);
+  private readonly translateService = inject(TranslateService);
+  private readonly rootRenderer = inject(RendererFactory2);
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
 

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs

@@ -70,19 +70,19 @@ export default class NavbarComponent implements OnInit {
   <%_ } _%>
 <%_ } _%>
 
-  private loginService = inject(LoginService);
+  private readonly loginService = inject(LoginService);
 <%_ if (enableTranslation) { _%>
-  private translateService = inject(TranslateService);
-  private stateStorageService = inject(StateStorageService);
+  private readonly translateService = inject(TranslateService);
+  private readonly stateStorageService = inject(StateStorageService);
   <%_ if (applicationTypeGateway && microfrontend) { _%>
-  private injector = inject(Injector);
+  private readonly injector = inject(Injector);
   <%_ } _%>
 <%_ } _%>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-  private accountService = inject(AccountService);
+  private readonly accountService = inject(AccountService);
 <%_ } _%>
-  private profileService = inject(ProfileService);
-  private router = inject(Router);
+  private readonly profileService = inject(ProfileService);
+  private readonly router = inject(Router);
 
   constructor() {
     if (VERSION) {

package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs

@@ -39,7 +39,7 @@ import { ProfileService } from './profile.service';
 export default class PageRibbonComponent implements OnInit {
   ribbonEnv$?: Observable<string | undefined>;
 
-  private profileService = inject(ProfileService);
+  private readonly profileService = inject(ProfileService);
 
   ngOnInit(): void {
     this.ribbonEnv$ = this.profileService.getProfileInfo().pipe(map(profileInfo => profileInfo.ribbonEnv));

package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs

@@ -26,10 +26,10 @@ import { ProfileInfo, InfoResponse } from './profile-info.model';
 
 @Injectable({ providedIn: 'root' })
 export class ProfileService {
-  private http = inject(HttpClient);
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly http = inject(HttpClient);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 
-  private infoUrl = this.applicationConfigService.getEndpointFor('management/info');
+  private readonly infoUrl = this.applicationConfigService.getEndpointFor('management/info');
   private profileInfo$?: Observable<ProfileInfo>;
 
   getProfileInfo(): Observable<ProfileInfo> {

package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs

@@ -41,9 +41,9 @@ export default class LoginComponent implements OnInit, AfterViewInit {
     rememberMe: new FormControl(false, { nonNullable: true, validators: [Validators.required] }),
   });
 
-  private accountService = inject(AccountService);
-  private loginService = inject(LoginService);
-  private router = inject(Router);
+  private readonly accountService = inject(AccountService);
+  private readonly loginService = inject(LoginService);
+  private readonly router = inject(Router);
 
   ngOnInit(): void {
     // if already authenticated then navigate to home page

package/dist/generators/angular/templates/src/main/webapp/app/login/login.service.ts.ejs

@@ -44,14 +44,14 @@ import { Login } from './login.model';
 @Injectable({ providedIn: 'root' })
 export class LoginService {
 <%_ if (authenticationTypeSession) { _%>
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
-  private location = inject(Location);
+  private readonly location = inject(Location);
 <%_ } else { _%>
-  private accountService = inject(AccountService);
+  private readonly accountService = inject(AccountService);
 <%_ } _%>
-  private authServerProvider = inject(AuthServerProvider);
+  private readonly authServerProvider = inject(AuthServerProvider);
 
 <%_ if (authenticationTypeOauth2) { _%>
   login(): void {

package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs

@@ -40,10 +40,10 @@ export class AlertErrorComponent implements OnDestroy {
   errorListener: Subscription;
   httpErrorListener: Subscription;
 
-  private alertService = inject(AlertService);
-  private eventManager = inject(EventManager);
+  private readonly alertService = inject(AlertService);
+  private readonly eventManager = inject(EventManager);
 <% if (enableTranslation) { %>
-  private translateService = inject(TranslateService);
+  private readonly translateService = inject(TranslateService);
 <% } %>
 
   constructor() {

package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs

@@ -31,7 +31,7 @@ import { AlertService, Alert } from 'app/core/util/alert.service';
 export class AlertComponent implements OnInit, OnDestroy {
   alerts = signal<Alert[]>([]);
 
-  private alertService = inject(AlertService);
+  private readonly alertService = inject(AlertService);
 
   ngOnInit(): void {
     this.alerts.set(this.alertService.get());

package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs

@@ -38,8 +38,8 @@ import { AccountService } from 'app/core/auth/account.service';
 export default class HasAnyAuthorityDirective {
   public authorities = input<string | string[]>([], { alias: '<%= jhiPrefix %>HasAnyAuthority' });
 
-  private templateRef = inject(TemplateRef<any>);
-  private viewContainerRef = inject(ViewContainerRef);
+  private readonly templateRef = inject(TemplateRef<any>);
+  private readonly viewContainerRef = inject(ViewContainerRef);
 
   constructor() {
     const accountService = inject(AccountService);

package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.spec.ts.ejs

@@ -81,7 +81,7 @@ describe('FilterModel Tests', () => {
 
         filters.clear();
 
-        expect(filters.filterChanges.next).not.toBeCalled();
+        expect(filters.filterChanges.next).not.toHaveBeenCalled();
         expect(filters.filterOptions).toMatchObject([]);
       });
       it('removes empty filters and emits next element', () => {
@@ -128,7 +128,7 @@ describe('FilterModel Tests', () => {
         const result = filters.addFilter('foo', 'existingFoo1', 'existingFoo2');
 
         expect(result).toBe(false);
-        expect(filters.filterChanges.next).not.toBeCalled();
+        expect(filters.filterChanges.next).not.toHaveBeenCalled();
         expect(filters.filterOptions).toMatchObject([{ name: 'foo', values: ['existingFoo1', 'existingFoo2'] }]);
       });
     });
@@ -151,7 +151,7 @@ describe('FilterModel Tests', () => {
         const result = filters.removeFilter('foo', 'nonExisting1');
 
         expect(result).toBe(false);
-        expect(filters.filterChanges.next).not.toBeCalled();
+        expect(filters.filterChanges.next).not.toHaveBeenCalled();
         expect(filters.filterOptions).toMatchObject([{ name: 'foo', values: ['existingFoo1', 'existingFoo2'] }]);
       });
       it("doesn't remove a non existing FilterOptions returns false", () => {
@@ -161,7 +161,7 @@ describe('FilterModel Tests', () => {
         const result = filters.removeFilter('nonExisting', 'nonExisting1');
 
         expect(result).toBe(false);
-        expect(filters.filterChanges.next).not.toBeCalled();
+        expect(filters.filterChanges.next).not.toHaveBeenCalled();
         expect(filters.filterOptions).toMatchObject([{ name: 'foo', values: ['existingFoo1', 'existingFoo2'] }]);
       });
     });

package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs

@@ -36,8 +36,8 @@ export default class TranslateDirective implements OnChanges, OnInit, OnDestroy
 
   private readonly directiveDestroyed = new Subject();
 
-  private el = inject(ElementRef);
-  private translateService = inject(TranslateService);
+  private readonly el = inject(ElementRef);
+  private readonly translateService = inject(TranslateService);
 
   ngOnInit(): void {
     this.translateService.onLangChange.pipe(takeUntil(this.directiveDestroyed)).subscribe(() => {

package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs

@@ -42,9 +42,9 @@ function lazyTranslatePartialLoader(http: HttpClient): TranslateLoader {
   ],
 })
 export class LazyTranslationModule {
-  private translateService = inject(TranslateService);
-  private translateLoader = inject(TranslateLoader);
-  private stateStorageService = inject(StateStorageService);
+  private readonly translateService = inject(TranslateService);
+  private readonly translateLoader = inject(TranslateLoader);
+  private readonly stateStorageService = inject(StateStorageService);
 
   constructor() {
     const { currentLang } = this.translateService.store;

package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs

@@ -35,7 +35,7 @@ export class SortByDirective {
   protected sortAscIcon = faSortUp;
   protected sortDescIcon = faSortDown;
 
-  private sort = inject(SortDirective, { host: true });
+  private readonly sort = inject(SortDirective, { host: true });
 
   constructor() {
     effect(() => {

package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.service.ts.ejs

@@ -21,7 +21,7 @@ import { SortState } from './sort-state';
 
 @Injectable({ providedIn: 'root' })
 export class SortService {
-  private collator = new Intl.Collator(undefined, {
+  private readonly collator = new Intl.Collator(undefined, {
     numeric: true,
     sensitivity: 'base',
   });

package/dist/generators/app/cleanup.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+/**
+ * Removes files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ */
+declare const _default: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
+export default _default;

package/dist/generators/app/cleanup.js

@@ -16,13 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asWritingTask } from '../base-application/support/index.js';
 /**
  * Removes files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
-export default function cleanupOldFilesTask() {
+export default asWritingTask(function cleanupOldFilesTask() {
     if (this.isJhipsterVersionLessThan('6.1.0')) {
         this.config.delete('blueprint');
         this.config.delete('blueprintVersion');
     }
-}
+});

package/dist/generators/app/command.d.ts

@@ -0,0 +1,66 @@
+declare const command: {
+    readonly options: {
+        readonly defaults: {
+            readonly description: "Execute jhipster with default config";
+            readonly type: BooleanConstructor;
+            readonly scope: "none";
+        };
+        readonly skipClient: {
+            readonly description: "Skip the client-side application generation";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly skipServer: {
+            readonly description: "Skip the server-side application generation";
+            readonly type: BooleanConstructor;
+            readonly scope: "storage";
+        };
+        readonly jhiPrefix: {
+            readonly description: "Add prefix before services, controllers and states name";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly entitySuffix: {
+            readonly description: "Add suffix after entities name";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly dtoSuffix: {
+            readonly description: "Add suffix after dtos name";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly blueprint: {
+            readonly description: "DEPRECATED: Specify a generator blueprint to use for the sub generators";
+            readonly type: ArrayConstructor;
+            readonly scope: "none";
+        };
+        readonly blueprints: {
+            readonly description: "A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs";
+            readonly type: StringConstructor;
+            readonly scope: "none";
+        };
+        readonly ignoreErrors: {
+            readonly description: "Don't fail on prettier errors.";
+            readonly type: BooleanConstructor;
+            readonly scope: "none";
+        };
+        readonly pkType: {
+            readonly description: "Default primary key type (beta)";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly clientPackageManager: {
+            readonly description: "Force an unsupported client package manager";
+            readonly type: StringConstructor;
+            readonly scope: "storage";
+        };
+        readonly testFrameworks: {
+            readonly description: "Test frameworks to be generated";
+            readonly type: ArrayConstructor;
+            readonly scope: "none";
+        };
+    };
+    readonly import: readonly ["bootstrap", "bootstrap-application-base", "common", "server", "client", "git", "cypress", "languages"];
+};
+export default command;

package/dist/generators/app/command.js

@@ -4,6 +4,7 @@ const command = {
         defaults: {
             description: 'Execute jhipster with default config',
             type: Boolean,
+            scope: 'none',
         },
         skipClient: {
             description: 'Skip the client-side application generation',
@@ -33,14 +34,17 @@ const command = {
         blueprint: {
             description: 'DEPRECATED: Specify a generator blueprint to use for the sub generators',
             type: Array,
+            scope: 'none',
         },
         blueprints: {
             description: 'A comma separated list of one or more generator blueprints to use for the sub generators, e.g. --blueprints kotlin,vuejs',
             type: String,
+            scope: 'none',
         },
         ignoreErrors: {
             description: "Don't fail on prettier errors.",
             type: Boolean,
+            scope: 'none',
         },
         pkType: {
             description: 'Default primary key type (beta)',
@@ -55,6 +59,7 @@ const command = {
         testFrameworks: {
             description: 'Test frameworks to be generated',
             type: Array,
+            scope: 'none',
         },
     },
     import: [

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

@@ -0,0 +1,26 @@
+/**
+ * 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 JHipsterAppGenerator extends BaseApplicationGenerator {
+    beforeQueue(): Promise<void>;
+    get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "validate" | "validateNode" | "checkForNewJHVersion">;
+    get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "setup" | "defaults" | "fixConfig" | "loadGlobalConfig">;
+    get composingComponent(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "composeCommon" | "composeServer" | "composeClient">;
+    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupOldFilesTask">;
+}

package/dist/generators/app/generator.js

@@ -22,7 +22,7 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_CLIENT, GENERATOR_COMMON, GENERATOR_SERVER } from '../generator-list.js';
 import { getDefaultAppName } from '../project-name/support/index.js';
 import { packageJson } from '../../lib/index.js';
-import { applicationTypes } from '../../jdl/jhipster/index.js';
+import { applicationTypes } from '../../lib/jhipster/index.js';
 import cleanupOldFilesTask from './cleanup.js';
 import { checkNode, loadStoredAppOptions } from './support/index.js';
 const { MICROSERVICE } = applicationTypes;

package/dist/generators/app/index.d.ts

@@ -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/app/support/check-node.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @private
+ * Check if Node is installed, up to date, and in LTS version.
+ * Will emit a warning if the current node version is too old compared to the required one or if it is not in LTS.
+ * @param {any} logger - the logging adapter
+ * @param {string} requiredNodeVersion - the version needed to run the generator (defaulted to the one mentionned in package.json)
+ * @param {string} currentNodeVersion - the version of Node installed on the machine (defaulted to the one running the generator)
+ */
+declare const checkNode: (logger: any, requiredNodeVersion?: any, currentNodeVersion?: string) => void;
+export default checkNode;

package/dist/generators/app/support/config.js

@@ -1,6 +1,6 @@
 import { camelCase, kebabCase, startCase, upperFirst } from 'lodash-es';
 import { NODE_VERSION } from '../../generator-constants.js';
-import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../jdl/index.js';
+import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../lib/jhipster/index.js';
 import { getHipster, mutateData, pickFields, upperFirstCamelCase } from '../../base/support/index.js';
 import { getDBTypeFromDBValue } from '../../server/support/index.js';
 import detectLanguage from '../../languages/support/detect-language.js';