Sonar recommendations (#32051)

Author: qmonmert

lib/jdl/converters/exporters/applications/jhipster-application-formatter.ts

@@ -59,7 +59,10 @@ function setUpApplicationStructure(application: JDLApplication): PostProcessedJD
   }
   applicationToExport[GENERATOR_NAME].entities = application.getEntityNames();
   if (application.hasConfigurationOption('creationTimestamp')) {
-    applicationToExport[GENERATOR_NAME].creationTimestamp = parseInt(application.getConfigurationOptionValue('creationTimestamp'), 10);
+    applicationToExport[GENERATOR_NAME].creationTimestamp = Number.parseInt(
+      application.getConfigurationOptionValue('creationTimestamp'),
+      10,
+    );
   }
   const postProcessedApplicationToExport: PostProcessedJDLJSONApplication = cleanUpOptions(applicationToExport as JDLJSONApplication);
   return postProcessedApplicationToExport;

lib/jdl/core/built-in-options/tokens/application-tokens.ts

@@ -127,8 +127,7 @@ export const buildApplicationTokens = (tokenConfigs: JDLTokenConfig[]) => {
         tokenConfig.categories = [applicationConfigCategoryToken];
         // This is actually needed as the skipClient & skipServer options are both entity & app options...
         if (['SKIP_CLIENT', 'SKIP_SERVER'].includes(tokenConfig.name)) {
-          tokenConfig.categories.push(KEYWORD);
-          tokenConfig.categories.push(UNARY_OPTION);
+          tokenConfig.categories.push(KEYWORD, UNARY_OPTION);
         }
         return createTokenFromConfig(tokenConfig);
       }),

lib/jdl/core/models/jdl-relationship.ts

@@ -141,7 +141,7 @@ export default class JDLRelationship implements JDLRelationshipModel {
 
     string += '\n}';
 
-    return string.replace(/ \n/g, '\n').replace(/[ ]{4}/g, '  ');
+    return string.replace(/ \n/g, '\n').replace(/ {4}/g, '  ');
   }
 
   private formatComment(comment: string | null | undefined): string {

lib/jdl/core/models/jdl-relationships.ts

@@ -119,7 +119,7 @@ export default class JDLRelationships {
 }
 
 function relationshipTypeToString(relationships: Map<string, JDLRelationship>, type: string) {
-  const relationshipsLines = [...relationships.values()].map(relationship => relationship.toString().split('\n').slice(1, -1)).flat();
+  const relationshipsLines = [...relationships.values()].flatMap(relationship => relationship.toString().split('\n').slice(1, -1));
   return `relationship ${type} {
 ${relationshipsLines.join('\n')}
 }`;

lib/jdl/jdl-importer.ts

@@ -177,9 +177,7 @@ function importOnlyEntities(jdlObject: JDLObject, configuration: JDLApplicationC
   let { applicationName } = configuration;
 
   let application = configuration.application;
-  if (!application) {
-    application = readCurrentPathYoRcFile();
-  }
+  application ??= readCurrentPathYoRcFile();
   if (application?.[GENERATOR_JHIPSTER]) {
     applicationName ??= application[GENERATOR_JHIPSTER].baseName;
   }

lib/jhipster/default-application-options.ts

@@ -145,10 +145,10 @@ function getConfigForAuthenticationType(options: ApplicationDefaults = {}): Appl
 
 function getConfigForPackageName(options: ApplicationDefaults = {}): ApplicationDefaults {
   if (!options[PACKAGE_NAME]) {
-    if (!options[PACKAGE_FOLDER]) {
-      options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];
-    } else {
+    if (options[PACKAGE_FOLDER]) {
       options[PACKAGE_NAME] = options[PACKAGE_FOLDER].split('/').filter(Boolean).join('.');
+    } else {
+      options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];
     }
   }
   return options;

lib/testing/support/matrix-utils.ts

@@ -43,20 +43,18 @@ export const fromMatrix = <T extends Record<string, any> = ConfigAll>(configMatr
   const samples = configEntries.reduce(
     (previousValue, currentValue) => {
       const [config, configValues] = currentValue;
-      return previousValue
-        .map(([previousName, previousConfig]) =>
-          configValues.map((value: ValueType) => {
-            return [
-              // @ts-expect-error fix type
-              appendTitle(previousName as string, config, value),
-              {
-                ...(previousConfig as Record<string, ValueType>),
-                [config]: value,
-              },
-            ];
-          }),
-        )
-        .flat();
+      return previousValue.flatMap(([previousName, previousConfig]) =>
+        configValues.map((value: ValueType) => {
+          return [
+            // @ts-expect-error fix type
+            appendTitle(previousName as string, config, value),
+            {
+              ...(previousConfig as Record<string, ValueType>),
+              [config]: value,
+            },
+          ];
+        }),
+      );
     },
     [['', {}]],
   );
@@ -73,9 +71,7 @@ const applyExtendedMatrix = <M extends Record<string, any> = ConfigAll, A extend
       const currentConfigObjects = configValues.map(configValue => ({
         [configName]: configValue,
       }));
-      return currentArray
-        .map(existingConfig => currentConfigObjects.map(currentObject => ({ ...existingConfig, ...currentObject })))
-        .flat();
+      return currentArray.flatMap(existingConfig => currentConfigObjects.map(currentObject => ({ ...existingConfig, ...currentObject })));
     },
     [{} as Record<keyof A, AdditionalValue<A, keyof A>>],
   );

lib/utils/yo-rc.ts

@@ -27,7 +27,7 @@ export const mergeYoRcContent = <
     merged[ns] = { ...oldConfig[ns], ...newConfig[ns] };
   }
   if ((oldConfig[YO_RC_CONFIG_KEY] as ConfigWithCreationTimestamp)?.creationTimestamp) {
-    (merged[YO_RC_CONFIG_KEY] as ConfigWithCreationTimestamp)!.creationTimestamp = (
+    (merged[YO_RC_CONFIG_KEY] as ConfigWithCreationTimestamp).creationTimestamp = (
       oldConfig[YO_RC_CONFIG_KEY] as ConfigWithCreationTimestamp
     ).creationTimestamp;
   }