generator-jhipster 8.9.0 → 8.10.0

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs

@@ -35,9 +35,9 @@
         </div>
     </h2>
 
-    <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
+    <<%= jhiPrefixDashed %>-alert-error />
 
-    <<%= jhiPrefixDashed %>-alert></<%= jhiPrefixDashed %>-alert>
+    <<%= jhiPrefixDashed %>-alert />
 <%_ if (searchEngineAny) { _%>
 
     <form name="searchForm" class="row row-cols-sm-auto align-items-center">
@@ -61,7 +61,7 @@
 <%_ } _%>
 
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-    <<%= jhiPrefixDashed %>-filter [filters]="filters"></<%= jhiPrefixDashed %>-filter>
+    <<%= jhiPrefixDashed %>-filter [filters]="filters" />
 <%_ } _%>
 
 @if (<%= entityInstancePlural %>().length === 0) {
@@ -221,7 +221,7 @@ _%>
 @if (<%= entityInstancePlural %>().length > 0) {
     <div>
         <div class="d-flex justify-content-center">
-            <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }"></<%= jhiPrefixDashed %>-item-count>
+            <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }" />
         </div>
 
         <div class="d-flex justify-content-center">

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

@@ -124,7 +124,7 @@ describe('<%= entityAngularName %> Management Component', () => {
           );
         });
 
-    it('Should call load all on init', () => {
+    it('should call load all on init', () => {
         // WHEN
         comp.ngOnInit();
 
@@ -134,7 +134,7 @@ describe('<%= entityAngularName %> Management Component', () => {
     });
 
     describe('track<%= primaryKey.nameCapitalized %>', () => {
-        it('Should forward to <%= entityInstance %>Service', () => {
+        it('should forward to <%= entityInstance %>Service', () => {
             const entity = <%- tsPrimaryKeySamples[0] %>;
             jest.spyOn(service, 'get<%= entityAngularName %>Identifier');
             const <%= primaryKey.name %> = comp.track<%= primaryKey.nameCapitalized %>(entity);

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

@@ -208,7 +208,7 @@ describe('<%= entityAngularName %> Service', () => {
         });
 
         describe('compare<%= entityAngularName %>', () => {
-            it('Should return true if both entities are null', () => {
+            it('should return true if both entities are null', () => {
                 const entity1 = null;
                 const entity2 = null;
 
@@ -217,7 +217,7 @@ describe('<%= entityAngularName %> Service', () => {
                 expect(compareResult).toEqual(true);
             });
 
-            it('Should return false if one entity is null', () => {
+            it('should return false if one entity is null', () => {
                 const entity1 = <%- tsPrimaryKeySamples[0] %>;
                 const entity2 = null;
 
@@ -228,7 +228,7 @@ describe('<%= entityAngularName %> Service', () => {
                 expect(compareResult2).toEqual(false);
             });
 
-            it('Should return false if primaryKey differs', () => {
+            it('should return false if primaryKey differs', () => {
                 const entity1 = <%- tsPrimaryKeySamples[0] %>;
                 const entity2 = <%- tsPrimaryKeySamples[1] %>;
 
@@ -239,7 +239,7 @@ describe('<%= entityAngularName %> Service', () => {
                 expect(compareResult2).toEqual(false);
             });
 
-            it('Should return false if primaryKey matches', () => {
+            it('should return false if primaryKey matches', () => {
                 const entity1 = <%- tsPrimaryKeySamples[0] %>;
                 const entity2 = <%- tsPrimaryKeySamples[0] %>;
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs

@@ -22,7 +22,7 @@
             <h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')</h2>
 
             <div>
-                <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
+                <<%= jhiPrefixDashed %>-alert-error />
 <%_ for (const field of fields.filter(field => !field.hidden)) {
   const fieldName = field.fieldName;
   const fieldNameHumanized = field.fieldNameHumanized;

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs

@@ -90,7 +90,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
   <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); _%>
   <%_ if (relationshipsWithCustomSharedOptions.length > 0) { _%>
     <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity; _%>
-        it('Should call <%= otherEntity.entityAngularName %> query and add missing value', () => {
+        it('should call <%= otherEntity.entityAngularName %> query and add missing value', () => {
                 const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
     <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
       <%_ const reference = relationship.reference _%>
@@ -128,7 +128,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
   <%_ for (const relationship of relationshipsWithCustomUniqueOptions) { %>
     <%_ const otherEntity = relationship.otherEntity _%>
     <%_ const reference = relationship.reference _%>
-        it('Should call <%= reference.name %> query and add missing value', () => {
+        it('should call <%= reference.name %> query and add missing value', () => {
                 const <%= entityInstance %> : I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
                 const <%= reference.name %> : I<%= otherEntity.entityAngularName %> = <%- otherEntity.tsPrimaryKeySamples[0] %>;
                 <%= entityInstance %>.<%= reference.name %> = <%= reference.name %>;
@@ -148,7 +148,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 
   <%_ } _%>
 <%_ } _%>
-        it('Should update editForm', () => {
+        it('should update editForm', () => {
             const <%= entityInstance %>: I<%= entityAngularName %> = <%- testEntityPrimaryKey1 %>;
 <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
   <%_ for (const relationship of relationshipsByEntityNeedingOptions) { _%>
@@ -174,7 +174,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 
     describe('save', () => {
 <%_ if (updatableEntity) { _%>
-        it('Should call update service on save for existing entity', () => {
+        it('should call update service on save for existing entity', () => {
             // GIVEN
             const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
             const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
@@ -198,7 +198,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
         });
 
 <%_ } _%>
-        it('Should call create service on save for new entity', () => {
+        it('should call create service on save for new entity', () => {
             // GIVEN
             const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
             const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
@@ -222,7 +222,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
         });
 <%_ if (updatableEntity) { _%>
 
-        it('Should set isSaving to false on error', () => {
+        it('should set isSaving to false on error', () => {
             // GIVEN
             const saveSubject = new Subject<HttpResponse<I<%= entityAngularName %>>>();
             const <%= entityInstance %> = <%- testEntityPrimaryKey0 %>;
@@ -253,7 +253,7 @@ _%>
         const { otherEntity } = relationship[0];
   _%>
         describe('compare<%= otherEntity.entityAngularName %>', () => {
-            it('Should forward to <%= otherEntity.entityInstance %>Service', () => {
+            it('should forward to <%= otherEntity.entityInstance %>Service', () => {
                 const entity = <%- otherEntity.tsPrimaryKeySamples[0] %>;
                 const entity2 = <%- otherEntity.tsPrimaryKeySamples[1] %>;
                 jest.spyOn(<%= otherEntity.entityInstance %>Service, 'compare<%= otherEntity.entityAngularName %>');

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

@@ -90,7 +90,7 @@ describe('Home Component', () => {
   });
 
   describe('ngOnInit', () => {
-    it('Should synchronize account variable with current account', () => {
+    it('should synchronize account variable with current account', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
       // GIVEN
       const authenticationState = new Subject<Account | null>();
@@ -128,7 +128,7 @@ describe('Home Component', () => {
 
   describe('login', () => {
 <%_ if (!authenticationTypeOauth2) { _%>
-    it('Should navigate to /login on login', () => {
+    it('should navigate to /login on login', () => {
       // WHEN
       comp.login();
 
@@ -136,7 +136,7 @@ describe('Home Component', () => {
       expect(mockRouter.navigate).toHaveBeenCalledWith(['/login']);
     });
 <%_ } else { _%>
-    it('Should call loginService.login on login', () => {
+    it('should call loginService.login on login', () => {
       // WHEN
       comp.login();
 
@@ -148,7 +148,7 @@ describe('Home Component', () => {
 
 <%_ if (!authenticationTypeOauth2) { _%>
   describe('ngOnDestroy', () => {
-    it('Should destroy authentication state subscription on component destroy', () => {
+    it('should destroy authentication state subscription on component destroy', () => {
       // GIVEN
       const authenticationState = new Subject<Account | null>();
       mockAccountService.getAuthenticationState = jest.fn(() => authenticationState.asObservable());

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

@@ -16,16 +16,16 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<<%= jhiPrefixDashed %>-page-ribbon></<%= jhiPrefixDashed %>-page-ribbon>
+<<%= jhiPrefixDashed %>-page-ribbon />
 
 <div>
-  <router-outlet name="navbar"></router-outlet>
+  <router-outlet name="navbar" />
 </div>
 
 <div class="container-fluid">
   <div class="card jh-card">
-    <router-outlet></router-outlet>
+    <router-outlet />
   </div>
 
-  <<%= jhiPrefixDashed %>-footer></<%= jhiPrefixDashed %>-footer>
+  <<%= jhiPrefixDashed %>-footer />
 </div>

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

@@ -76,7 +76,7 @@ describe('Navbar Component', () => {
     profileService = TestBed.inject(ProfileService);
   });
 
-  it('Should call profileService.getProfileInfo on init', () => {
+  it('should call profileService.getProfileInfo on init', () => {
     // GIVEN
     jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 
@@ -87,7 +87,7 @@ describe('Navbar Component', () => {
     expect(profileService.getProfileInfo).toHaveBeenCalled();
   });
 
-  it('Should hold current authenticated user in variable account', () => {
+  it('should hold current authenticated user in variable account', () => {
     // WHEN
     comp.ngOnInit();
 
@@ -107,7 +107,7 @@ describe('Navbar Component', () => {
     expect(comp.account()).toBeNull();
   });
 
-  it('Should hold current authenticated user in variable account if user is authenticated before page load', () => {
+  it('should hold current authenticated user in variable account if user is authenticated before page load', () => {
     // GIVEN
     accountService.authenticate(account);
 

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

@@ -27,7 +27,7 @@ describe('Page Ribbon Component', () => {
     profileService = TestBed.inject(ProfileService);
   });
 
-  it('Should call profileService.getProfileInfo on init', () => {
+  it('should call profileService.getProfileInfo on init', () => {
     // GIVEN
     jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 

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

@@ -16,9 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, inject, OnInit } from '@angular/core';
+import { Component, Injector, OnInit, Signal, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { toSignal } from '@angular/core/rxjs-interop';
 
 import SharedModule from 'app/shared/shared.module';
 import { ProfileService } from './profile.service';
@@ -26,9 +27,9 @@ import { ProfileService } from './profile.service';
 @Component({
   selector: '<%= jhiPrefixDashed %>-page-ribbon',
   template: `
-    @if (ribbonEnv$ | async; as ribbonEnv) {
+    @if (ribbonEnvSignal; as ribbonEnv) {
       <div class="ribbon">
-        <a href="">__jhiTranslateTagEnum__('global.ribbon', { "value": "ribbonEnv ?? ''" })</a>
+        <a href="">__jhiTranslateTagEnum__('global.ribbon', { "value": "ribbonEnv() ?? ''" })</a>
       </div>
     }
   `,
@@ -36,11 +37,12 @@ import { ProfileService } from './profile.service';
   imports: [SharedModule],
 })
 export default class PageRibbonComponent implements OnInit {
-  ribbonEnv$?: Observable<string | undefined>;
-
+  ribbonEnvSignal?: Signal<string | undefined>;
+  private readonly injector = inject(Injector);
   private readonly profileService = inject(ProfileService);
 
   ngOnInit(): void {
-    this.ribbonEnv$ = this.profileService.getProfileInfo().pipe(map(profileInfo => profileInfo.ribbonEnv));
+    const ribbonEnv$: Observable<string | undefined> = this.profileService.getProfileInfo().pipe(map(profileInfo => profileInfo.ribbonEnv));
+    this.ribbonEnvSignal = toSignal(ribbonEnv$, { injector: this.injector });
   }
 }

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

@@ -65,7 +65,7 @@ describe('LoginComponent', () => {
   });
 
   describe('ngOnInit', () => {
-    it('Should call accountService.identity on Init', () => {
+    it('should call accountService.identity on Init', () => {
       // GIVEN
       mockAccountService.identity = jest.fn(() => of(null));
       mockAccountService.getAuthenticationState = jest.fn(() => of(null));
@@ -77,7 +77,7 @@ describe('LoginComponent', () => {
       expect(mockAccountService.identity).toHaveBeenCalled();
     });
 
-    it('Should call accountService.isAuthenticated on Init', () => {
+    it('should call accountService.isAuthenticated on Init', () => {
       // GIVEN
       mockAccountService.identity = jest.fn(() => of(null));
 
@@ -156,7 +156,7 @@ describe('LoginComponent', () => {
 
     it('should stay on login form and show error message on login error', () => {
       // GIVEN
-      mockLoginService.login = jest.fn(() => throwError(() => {}));
+      mockLoginService.login = jest.fn(() => throwError(Error));
 
       // WHEN
       comp.login();

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

@@ -66,7 +66,7 @@ describe('Alert Error Component', () => {
   });
 
   describe('Error Handling', () => {
-    it('Should display an alert on status 0', () => {
+    it('should display an alert on status 0', () => {
       // GIVEN
       eventManager.broadcast({ name: '<%= frontendAppName %>.httpError', content: { status: 0 } });
       // THEN
@@ -74,7 +74,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe(<% if (enableTranslation) { %>'error.server.not.reachable'<% } else { %>'Server not reachable'<% } %>);
     });
 
-    it('Should display an alert on status 404', () => {
+    it('should display an alert on status 404', () => {
       // GIVEN
       eventManager.broadcast({ name: '<%= frontendAppName %>.httpError', content: { status: 404 } });
       // THEN
@@ -82,7 +82,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe(<% if (enableTranslation) { %>'error.url.not.found'<% } else { %>'Not found'<% } %>);
     });
 
-    it('Should display an alert on generic error', () => {
+    it('should display an alert on generic error', () => {
       // GIVEN
       eventManager.broadcast({ name: '<%= frontendAppName %>.httpError', content: { error: { message: 'Error Message' } } });
       eventManager.broadcast({ name: '<%= frontendAppName %>.httpError', content: { error: 'Second Error Message' } });
@@ -92,7 +92,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[1].<%= mainAlertField %>).toBe('Second Error Message');
     });
 
-    it('Should display an alert on status 400 for generic error', () => {
+    it('should display an alert on status 400 for generic error', () => {
       // GIVEN
       const response = new HttpErrorResponse({
         url: 'http://localhost:8080/api/foos',
@@ -113,7 +113,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe('error.validation');
     });
 
-    it('Should display an alert on status 400 for generic error without message', () => {
+    it('should display an alert on status 400 for generic error without message', () => {
       // GIVEN
       const response = new HttpErrorResponse({
         url: 'http://localhost:8080/api/foos',
@@ -127,7 +127,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe('Bad Request');
     });
 
-    it('Should display an alert on status 400 for invalid parameters', () => {
+    it('should display an alert on status 400 for invalid parameters', () => {
       // GIVEN
       const response = new HttpErrorResponse({
         url: 'http://localhost:8080/api/foos',
@@ -149,7 +149,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe(<% if (enableTranslation) { %>'error.Size'<% } else { %>'Error on field "MinField"'<% } %>);
     });
 
-    it('Should display an alert on status 400 for error headers', () => {
+    it('should display an alert on status 400 for error headers', () => {
       // GIVEN
       const response = new HttpErrorResponse({
         url: 'http://localhost:8080/api/foos',
@@ -167,7 +167,7 @@ describe('Alert Error Component', () => {
       expect(comp.alerts()[0].<%= mainAlertField %>).toBe('Error Message');
     });
 
-    it('Should display an alert on status 500 with detail', () => {
+    it('should display an alert on status 500 with detail', () => {
       // GIVEN
       const response = new HttpErrorResponse({
         url: 'http://localhost:8080/api/foos',

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

@@ -44,7 +44,7 @@ describe('Alert Component', () => {
     mockAlertService = TestBed.inject(AlertService);
   });
 
-  it('Should call alertService.get on init', () => {
+  it('should call alertService.get on init', () => {
     // WHEN
     comp.ngOnInit();
 
@@ -52,7 +52,7 @@ describe('Alert Component', () => {
     expect(mockAlertService.get).toHaveBeenCalled();
   });
 
-  it('Should call alertService.clear on destroy', () => {
+  it('should call alertService.clear on destroy', () => {
     // WHEN
     comp.ngOnDestroy();
 

package/dist/generators/angular/templates/src/main/webapp/app/shared/pagination/item-count.component.ts.ejs

@@ -30,7 +30,7 @@ import TranslateDirective from '../language/translate.directive';
 <%_ if (enableTranslation) { _%>
     <div <%= jhiPrefix %>Translate="global.item-count" [translateValues]="{ first: first(), second: second(), total: total() }"></div>
 <%_ } else { _%>
-    <div>__jhiTransformTranslate__('global.item-count')</div>
+    <div>__jhiTransformTranslate__('global.item-count', { "first": "{{ first() }}", "second": "{{ second() }}", "total": "{{ total() }}" })</div>
 <%_ } _%>
   `,
 <%_ if (enableTranslation) { _%>

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

@@ -18,7 +18,10 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class JHipsterAppGenerator extends BaseApplicationGenerator {
-    [x: string]: any;
+    [BaseApplicationGenerator.INITIALIZING]: any;
+    [BaseApplicationGenerator.CONFIGURING]: any;
+    [BaseApplicationGenerator.COMPOSING_COMPONENT]: any;
+    [BaseApplicationGenerator.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">;
     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">;

package/dist/generators/base/support/contents.d.ts

@@ -23,7 +23,7 @@
  * @param lineEnding
  * @returns normalized line ending string
  */
-export declare function normalizeLineEndings(str: string, lineEnding: string): string;
+export declare function normalizeLineEndings(str: string, lineEnding: '\n' | '\r\n'): string;
 /**
  * @private
  * @deprecated

package/dist/generators/base/support/needles.d.ts

@@ -1,14 +1,23 @@
 import type CoreGenerator from '../../base-core/index.js';
 import type { CascatedEditFileCallback, EditFileCallback, NeedleCallback } from '../api.js';
+type NeedleContentToAddCallback = {
+    /**
+     * Position of the needle start.
+     */
+    needleIndex: number;
+    /**
+     * Position of the needle line's new line char.
+     */
+    needleLineIndex: number;
+    needleIndent: number;
+    indentPrefix: string;
+};
 export type NeedleInsertion = {
     needle: string;
     /**
      * Content to add.
      */
-    contentToAdd: string | string[] | ((content: string, options: {
-        needleIndent: number;
-        indentPrefix: string;
-    }) => string);
+    contentToAdd: string | string[] | ((content: string, options: NeedleContentToAddCallback) => string);
     contentToCheck?: string | RegExp;
     /**
      * check existing content ignoring white spaces and new lines.
@@ -38,7 +47,7 @@ type NeedleContentInsertion = NeedleInsertion & {
     content: string;
 };
 /**
- * Change spaces sequences and '>' to allow any number of spaces or new line prefix
+ * Change spaces sequences and characters that prettier breaks line (<>()) to allow any number of spaces or new line prefix
  */
 export declare const convertToPrettierExpressions: (str: string) => string;
 /**

package/dist/generators/base/support/needles.js

@@ -19,10 +19,14 @@
 import assert from 'assert';
 import { escapeRegExp, kebabCase } from 'lodash-es';
 import { joinCallbacks } from './write-files.js';
+import { normalizeLineEndings } from './contents.js';
 /**
- * Change spaces sequences and '>' to allow any number of spaces or new line prefix
+ * Change spaces sequences and characters that prettier breaks line (<>()) to allow any number of spaces or new line prefix
  */
-export const convertToPrettierExpressions = (str) => str.replace(/\s+/g, '([\\s\n]*)').replace(/>+/g, '(\n?[\\s]*)>');
+export const convertToPrettierExpressions = (str) => str
+    .replace(/(<|\\\()(?! )/g, '$1\\n?[\\s]*')
+    .replace(/(?! )(>|\\\))/g, ',?\\n?[\\s]*$1')
+    .replace(/\s+/g, '[\\s\\n]*');
 /**
  * Check if contentToCheck existing in content
  *
@@ -58,29 +62,32 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
     assert(needle, 'needle is required');
     assert(content, 'content is required');
     assert(contentToAdd, 'contentToAdd is required');
+    const isCrLr = content.includes('\r\n');
+    content = isCrLr ? normalizeLineEndings(content, '\n') : content;
+    const lineEnding = isCrLr ? '\r\n' : '\n';
     needle = needle.includes('jhipster-needle-') ? needle : `jhipster-needle-${needle}`;
-    let regexp = new RegExp(`(?://|<!--|/*|#) ${needle}(?:$|\n| )`, 'g');
-    let firstMatch = regexp.exec(content);
+    const regexp = new RegExp(`(?://|<!--|/\\*|#) ${needle}(?:$|\n| )`, 'g');
+    const firstMatch = regexp.exec(content);
     if (!firstMatch) {
-        regexp = new RegExp(`"${needle}": `, 'g');
-        firstMatch = regexp.exec(content);
-        if (!firstMatch) {
-            return null;
-        }
+        return null;
     }
     // Replacements using functions allows to replace multiples needles
     if (typeof contentToAdd !== 'function' && regexp.exec(content)) {
         throw new Error(`Multiple needles found for ${needle}`);
     }
     const needleIndex = firstMatch.index;
-    const needleLineIndex = content.lastIndexOf('\n', needleIndex);
-    const beforeContent = content.substring(0, needleLineIndex + 1);
-    const afterContent = content.substring(needleLineIndex + 1);
-    // Find needle ident
-    const needleLine = afterContent.split('\n', 2)[0];
-    const needleIndent = needleLine.length - needleLine.trimStart().length;
+    const needleLineIndex = content.lastIndexOf('\n', needleIndex) + 1;
+    const beforeContent = content.substring(0, needleLineIndex);
+    const afterContent = content.substring(needleLineIndex);
+    const needleIndent = needleIndex - needleLineIndex;
     if (typeof contentToAdd === 'function') {
-        return contentToAdd(content, { needleIndent, indentPrefix: ' '.repeat(needleIndent) });
+        const newContent = contentToAdd(content, {
+            needleIndex,
+            needleLineIndex,
+            needleIndent,
+            indentPrefix: ' '.repeat(needleIndent),
+        });
+        return isCrLr ? normalizeLineEndings(newContent, lineEnding) : newContent;
     }
     contentToAdd = Array.isArray(contentToAdd) ? contentToAdd : [contentToAdd];
     if (autoIndent) {
@@ -110,7 +117,8 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
         });
         contentToAdd = contentToAdd.map(line => (line.length > identToRemove ? line.substring(identToRemove) : ''));
     }
-    return `${beforeContent}${contentToAdd.join('\n')}\n${afterContent}`;
+    const newContent = `${beforeContent}${contentToAdd.join('\n')}\n${afterContent}`;
+    return isCrLr ? normalizeLineEndings(newContent, lineEnding) : newContent;
 };
 /**
  * Create an callback to insert the new content into existing content.

package/dist/generators/base-application/support/prepare-entity.js

@@ -112,9 +112,8 @@ export const entityDefaultConfig = {
     },
 };
 export default function prepareEntity(entityWithConfig, generator, application) {
-    const { applicationTypeMicroservice, microfrontend } = application;
+    const { applicationTypeMicroservice, microfrontend, dtoSuffix = '' } = application;
     const entityName = upperFirst(entityWithConfig.name);
-    const entitySuffix = entityWithConfig.entitySuffix ?? application.entitySuffix;
     mutateData(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
     if (entityWithConfig.changelogDate) {
         try {
@@ -139,42 +138,31 @@ export default function prepareEntity(entityWithConfig, generator, application)
     }
     mutateData(entityWithConfig, {
         entityNameCapitalized: entityName,
+        entityNamePlural: pluralize(entityName),
+        entityNamePluralizedAndSpinalCased: ({ entityNamePlural }) => kebabCase(entityNamePlural),
         entityClass: upperFirst(entityName),
+        entityClassPlural: ({ entityNamePlural }) => upperFirst(entityNamePlural),
         entityInstance: lowerFirst(entityName),
+        entityInstancePlural: ({ entityNamePlural }) => lowerFirst(entityNamePlural),
         entityTableName: hibernateSnakeCase(entityName),
-        entityNamePlural: pluralize(entityName),
         entityAuthority: entityWithConfig.adminEntity ? 'ROLE_ADMIN' : undefined,
     });
+    const entitySuffix = entityWithConfig.entitySuffix ?? application.entitySuffix;
+    const dto = entityWithConfig.dto && entityWithConfig.dto !== NO_DTO;
     mutateData(entityWithConfig, {
         persistClass: `${entityWithConfig.entityClass}${entitySuffix ?? ''}`,
         persistInstance: `${entityWithConfig.entityInstance}${entitySuffix ?? ''}`,
-    });
-    const dto = entityWithConfig.dto && entityWithConfig.dto !== NO_DTO;
-    if (dto) {
-        const { dtoSuffix = '' } = application;
-        mutateData(entityWithConfig, {
-            dtoClass: `${entityWithConfig.entityClass}${dtoSuffix}`,
-            dtoInstance: `${entityWithConfig.entityInstance}${dtoSuffix}`,
-            restClass: ({ dtoClass }) => dtoClass,
-            restInstance: ({ dtoInstance }) => dtoInstance,
-        });
-    }
-    else {
-        mutateData(entityWithConfig, {
-            restClass: ({ persistClass }) => persistClass,
-            restInstance: ({ persistInstance }) => persistInstance,
-        });
-    }
-    mutateData(entityWithConfig, {
-        entityNamePluralizedAndSpinalCased: kebabCase(entityWithConfig.entityNamePlural),
-        entityClassPlural: upperFirst(entityWithConfig.entityNamePlural),
-        entityInstancePlural: lowerFirst(entityWithConfig.entityNamePlural),
+        // Even if dto is not used, we need to generate the dtoClass and dtoInstance is added to avoid errors in rendered relationships templates. The resulting class will not exist then.
+        dtoClass: `${entityWithConfig.entityClass}${dtoSuffix}`,
+        dtoInstance: `${entityWithConfig.entityInstance}${dtoSuffix}`,
+        restClass: dto ? ({ dtoClass }) => dtoClass : ({ persistClass }) => persistClass,
+        restInstance: dto ? ({ dtoInstance }) => dtoInstance : ({ persistInstance }) => persistInstance,
     });
     mutateData(entityWithConfig, {
         // Implement i18n variant ex: 'male', 'female' when applied
         entityI18nVariant: 'default',
-        entityClassHumanized: startCase(entityWithConfig.entityNameCapitalized),
-        entityClassPluralHumanized: startCase(entityWithConfig.entityClassPlural),
+        entityClassHumanized: ({ entityNameCapitalized }) => startCase(entityNameCapitalized),
+        entityClassPluralHumanized: ({ entityNamePlural }) => startCase(entityNamePlural),
     });
     mutateData(entityWithConfig, {
         __override__: false,