Skip to content

Commit fe32d7f

Browse files
authored
Fix: bump prettier from 3.6.2 to 3.7.1 (jhipster#31527)
1 parent 779ca69 commit fe32d7f

File tree

12 files changed

+24
-31
lines changed

12 files changed

+24
-31
lines changed

generators/base-application/application.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ export const mutateUserManagementApplication = {
4848
syncUserWithIdp: data =>
4949
Boolean(
5050
(data.backendType ?? 'Java') === 'Java' &&
51-
data.authenticationType === 'oauth2' &&
52-
data.databaseType !== 'no' &&
53-
(data.applicationType === 'gateway' || data.anyEntityHasRelationshipWithUser),
51+
data.authenticationType === 'oauth2' &&
52+
data.databaseType !== 'no' &&
53+
(data.applicationType === 'gateway' || data.anyEntityHasRelationshipWithUser),
5454
),
5555
generateBuiltInUserEntity: ({ generateUserManagement, syncUserWithIdp }) => Boolean(generateUserManagement || syncUserWithIdp),
5656
generateBuiltInAuthorityEntity: ({ generateBuiltInUserEntity, databaseType }) =>

generators/base-application/entity.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ type BaseApplicationAddedEntityProperties = {
344344
* Interface is used to allow `this` type in the relationships.
345345
*/
346346
export interface Entity<F extends Field = Field, R extends Relationship = Relationship>
347-
extends BaseApplicationAddedEntityProperties,
348-
Omit<Required<BaseEntity<F>>, 'relationships'> {
347+
extends BaseApplicationAddedEntityProperties, Omit<Required<BaseEntity<F>>, 'relationships'> {
349348
relationships: RelationshipWithEntity<R, this, F>[];
350349
otherRelationships: R[];
351350

generators/client/command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const command = {
125125
when: answers => {
126126
const askForMicrofrontends = Boolean(
127127
(answers.microfrontend ?? config.microfrontend) &&
128-
(answers.applicationType ?? config.applicationType) === APPLICATION_TYPE_GATEWAY,
128+
(answers.applicationType ?? config.applicationType) === APPLICATION_TYPE_GATEWAY,
129129
);
130130
if (askForMicrofrontends && answers.microfrontends) {
131131
answers.microfrontends = microfrontendsToPromptValue(answers.microfrontends);

generators/client/entity.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,4 @@ export const mutateEntity = {
9292
} as const satisfies MutateDataPropertiesWithRequiredProperties<MutateDataParam<Entity>, ClientAddedEntityProperties>;
9393

9494
export interface Entity<F extends Field = Field, R extends BaseApplicationRelationship = BaseApplicationRelationship>
95-
extends CommonEntity<F, R>,
96-
LanguagesEntity<F, R>,
97-
ClientAddedEntityProperties {}
95+
extends CommonEntity<F, R>, LanguagesEntity<F, R>, ClientAddedEntityProperties {}

generators/common/entity.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ export const mutateEntity = {
7171
} as const satisfies MutateDataPropertiesWithRequiredProperties<MutateDataParam<Entity>, CommonAddedEntityProperties>;
7272

7373
export interface Entity<F extends Field = Field, R extends BaseApplicationRelationship = BaseApplicationRelationship>
74-
extends LanguagesEntity<F, R>,
75-
BaseApplicationEntity<F, R>,
76-
CommonAddedEntityProperties {
74+
extends LanguagesEntity<F, R>, BaseApplicationEntity<F, R>, CommonAddedEntityProperties {
7775
restProperties?: (F | R)[];
7876

7977
uniqueEnums?: F[];

generators/languages/entity.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ type LanguagesAddedEntityProperties = {
3737
export interface Entity<
3838
F extends BaseApplicationField = BaseApplicationField,
3939
R extends BaseApplicationRelationship = BaseApplicationRelationship,
40-
> extends BaseApplicationEntity<F, R>,
41-
LanguagesAddedEntityProperties {
40+
>
41+
extends BaseApplicationEntity<F, R>, LanguagesAddedEntityProperties {
4242
i18nKeyPrefix: string;
4343
i18nAlertHeaderPrefix: string;
4444
}

generators/liquibase/types.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ export interface DatabaseRelationship extends BaseApplicationRelationship, Datab
5757
joinColumnNames?: string[];
5858
}
5959

60-
export interface DatabaseEntity<F extends DatabaseField = DatabaseField, R extends DatabaseRelationship = DatabaseRelationship>
61-
extends BaseApplicationEntity<F, R> {
60+
export interface DatabaseEntity<
61+
F extends DatabaseField = DatabaseField,
62+
R extends DatabaseRelationship = DatabaseRelationship,
63+
> extends BaseApplicationEntity<F, R> {
6264
entityTableName: string;
6365
}
6466
type Property = {
@@ -97,9 +99,7 @@ export type Field = BaseEntityChangesField &
9799
};
98100

99101
export interface Entity<F extends Field = Field, R extends Relationship = Relationship>
100-
extends BaseEntityChangesEntity<F, R>,
101-
JavaEntity<F, R>,
102-
DatabaseEntity<F, R> {
102+
extends BaseEntityChangesEntity<F, R>, JavaEntity<F, R>, DatabaseEntity<F, R> {
103103
anyRelationshipIsOwnerSide: boolean;
104104
liquibaseFakeData: Record<string, any>[];
105105
fakeDataCount: number;

generators/server/types.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ export interface Relationship extends JavaRelationship, LanguagesRelationship, C
3737
}
3838

3939
export interface Entity<F extends Field = Field, R extends Relationship = Relationship>
40-
extends JavaEntity<F, R>,
41-
CommonEntity<F, R>,
42-
DatabaseEntity<F, R> {
40+
extends JavaEntity<F, R>, CommonEntity<F, R>, DatabaseEntity<F, R> {
4341
skipCheckLengthOfIdentifier?: boolean;
4442
}
4543

lib/types/application-all.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ export interface RelationshipAll extends SpringDataRelationalRelationship, Serve
5252
}
5353

5454
export interface EntityAll<F extends FieldAll = FieldAll, R extends RelationshipAll = RelationshipAll>
55-
extends BaseApplicationEntity<F, R>,
55+
extends
56+
BaseApplicationEntity<F, R>,
5657
AngularEntity<F, R>,
5758
LiquibaseEntity<F, R>,
5859
SpringDataRelationalEntity<F, R>,

lib/utils/derived-property.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ export const buildMutateDataForProperty = <
5656
const S extends string = '',
5757
const IsAny extends boolean = false,
5858
const IsArray extends boolean = false,
59-
const Data extends Partial<
60-
Record<P, IsArray extends true ? PropertyType[] : IsAny extends true ? any : PropertyType | undefined>
61-
> = Simplify<Partial<Record<P, IsArray extends true ? PropertyType[] : IsAny extends true ? any : PropertyType | undefined>>>,
59+
const Data extends Partial<Record<P, IsArray extends true ? PropertyType[] : IsAny extends true ? any : PropertyType | undefined>> =
60+
Simplify<Partial<Record<P, IsArray extends true ? PropertyType[] : IsAny extends true ? any : PropertyType | undefined>>>,
6261
>(
6362
property: P,
6463
possibleValues: Values,

0 commit comments

Comments
 (0)