Sonar recommendations (#32059)

Author: qmonmert

generators/base-application/entity.ts

@@ -192,13 +192,13 @@ export const mutateRelationship = {
   collection: ({ relationshipType }) => relationshipType === 'one-to-many' || relationshipType === 'many-to-many',
 
   relationshipFieldName: ({ relationshipName }) => lowerFirst(relationshipName),
-  relationshipFieldNamePlural: ({ relationshipFieldName }) => pluralize(relationshipFieldName!),
+  relationshipFieldNamePlural: ({ relationshipFieldName }) => pluralize(relationshipFieldName),
   relationshipNamePlural: ({ relationshipName }) => pluralize(relationshipName),
   relationshipNameCapitalized: ({ relationshipName }) => upperFirst(relationshipName),
   relationshipNameHumanized: ({ relationshipName }) => startCase(relationshipName),
 
   propertyName: ({ collection, relationshipFieldName, relationshipFieldNamePlural }) =>
-    collection ? relationshipFieldNamePlural! : relationshipFieldName!,
+    collection ? relationshipFieldNamePlural : relationshipFieldName,
 
   ...mutateProperty,
 } as const satisfies MutateDataPropertiesWithRequiredProperties<MutateDataParam<Relationship>, BaseApplicationAddedRelationshipProperties>;

generators/base-application/internal/utils.ts

@@ -259,7 +259,7 @@ export function createAuthorityEntity(
     ...customAuthorityData,
   };
 
-  loadRequiredConfigIntoEntity(authorityEntity, application as BaseApplicationApplication<BaseApplicationEntity>);
+  loadRequiredConfigIntoEntity(authorityEntity, application);
   // Fallback to defaults for test cases.
   loadRequiredConfigIntoEntity(authorityEntity, this.jhipsterConfigWithDefaults as BaseApplicationApplication<BaseApplicationEntity>);
 
@@ -281,15 +281,15 @@ function addOrExtendFields<const F extends BaseApplicationField>(fields: F[], fi
   for (const fieldToAdd of fieldsToAdd) {
     const { fieldName: newFieldName, id } = fieldToAdd;
     let field = fields.find(field => field.fieldName === newFieldName);
-    if (!field) {
+    if (field) {
+      defaults(field, fieldToAdd);
+    } else {
       field = { ...fieldToAdd };
       if (id) {
         fields.unshift(field);
       } else {
         fields.push(field);
       }
-    } else {
-      defaults(field, fieldToAdd);
     }
   }
 }
@@ -298,11 +298,11 @@ function addOrExtendRelationships<const R extends BaseApplicationRelationship>(r
   for (const relationshipToAdd of relationshipsToAdd) {
     const { relationshipName: newrelationshipName } = relationshipToAdd;
     let relationship = relationships.find(relationship => relationship.relationshipName === newrelationshipName);
-    if (!relationship) {
+    if (relationship) {
+      defaults(relationship, relationshipToAdd);
+    } else {
       relationship = { ...relationshipToAdd };
       relationships.push(relationship);
-    } else {
-      defaults(relationship, relationshipToAdd);
     }
   }
 }

generators/base-application/support/prepare-entity.ts

@@ -498,8 +498,7 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: EntityAll) {
 
   const types = entity.relationships
     .filter(rel => rel.otherEntity.primaryKey)
-    .map(rel => rel.otherEntity.primaryKey!.fields.map(f => f.fieldType))
-    .flat();
+    .flatMap(rel => rel.otherEntity.primaryKey!.fields.map(f => f.fieldType));
   entity.otherEntityPrimaryKeyTypes = Array.from(new Set(types));
   entity.otherEntityPrimaryKeyTypesIncludesUUID = types.includes(UUID);
 

generators/base-application/support/relationship.ts

@@ -133,7 +133,7 @@ export const addOtherRelationship = <const R extends BaseApplicationRelationship
   const otherRelationship = {
     otherEntityName: lowerFirst(entity.name),
     otherEntityRelationshipName: relationship.relationshipName,
-    relationshipName: relationship.otherEntityRelationshipName as string,
+    relationshipName: relationship.otherEntityRelationshipName,
     relationshipType: otherRelationshipType(relationship.relationshipType),
     otherEntity: entity,
     ownerSide: !relationship.ownerSide,

generators/base-core/internal/write-files.ts

@@ -31,13 +31,11 @@ export const convertWriteFileSectionsToBlocks = <DataType, Generator>(
     })
     .filter(({ sectionName }) => !sectionName.startsWith('_'));
 
-  return parsedSections
-    .map(({ sectionName, sectionBlocks }) => {
-      return sectionBlocks.map((block, blockIdx) => {
-        const blockSpecPath = `${sectionName}[${blockIdx}]`;
-        assert(typeof block === 'object', `Block must be an object for ${blockSpecPath}`);
-        return { blockSpecPath, ...block };
-      });
-    })
-    .flat();
+  return parsedSections.flatMap(({ sectionName, sectionBlocks }) => {
+    return sectionBlocks.map((block, blockIdx) => {
+      const blockSpecPath = `${sectionName}[${blockIdx}]`;
+      assert(typeof block === 'object', `Block must be an object for ${blockSpecPath}`);
+      return { blockSpecPath, ...block };
+    });
+  });
 };

generators/base-core/support/needles.ts

@@ -216,7 +216,7 @@ export const insertContentBeforeNeedle = ({ content, contentToAdd, needle, autoI
   }
   contentToAdd = Array.isArray(contentToAdd) ? contentToAdd : [contentToAdd];
   if (autoIndent) {
-    contentToAdd = contentToAdd.map(eachContentToAdd => eachContentToAdd.split('\n')).flat();
+    contentToAdd = contentToAdd.flatMap(eachContentToAdd => eachContentToAdd.split('\n'));
   }
 
   // Normalize needle indent with contentToAdd.

generators/base-core/support/properties-file.ts

@@ -76,7 +76,7 @@ export const editPropertiesFileCallback = (
         const existingLine = lines.find(line => Array.isArray(line) && line[0] === key) as string[] | undefined;
         if (existingLine) {
           if (typeof value === 'function' || valueSep) {
-            existingLine[1] = getNewValue(value, existingLine[1] as string, valueSep);
+            existingLine[1] = getNewValue(value, existingLine[1], valueSep);
           } else {
             existingLine[1] = value;
           }