adjust some types

jhipster · Jan 7, 2025 · a03027f · a03027f
1 parent 51e6608
commit a03027f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/generators/base-application/support/relationship.ts b/generators/base-application/support/relationship.ts
@@ -86,7 +86,7 @@ export const loadEntitiesOtherSide = (entities: Entity[], { application }: { app
       relationship.otherEntity = otherEntity;
       const otherRelationship = findOtherRelationshipInRelationships(entity.name, relationship, otherEntity.relationships ?? []);
       if (otherRelationship) {
-        relationship.otherRelationship = otherRelationship as Relationship;
+        relationship.otherRelationship = otherRelationship;
         otherRelationship.otherEntityRelationshipName = otherRelationship.otherEntityRelationshipName ?? relationship.relationshipName;
         relationship.otherEntityRelationshipName = relationship.otherEntityRelationshipName ?? otherRelationship.relationshipName;
         if (

diff --git a/generators/bootstrap-application-client/generator.ts b/generators/bootstrap-application-client/generator.ts
@@ -69,8 +69,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
         loadDerivedConfig(clientCommand.configs, { application });
         loadDerivedClientConfig({ application });
       },
-      prepareForTemplates({ application: app }) {
-        const application: any = app;
+      prepareForTemplates({ application }) {
         application.frontendAppName = getFrontendAppName({ baseName: application.baseName });
       },
     });

diff --git a/generators/client/types.d.ts b/generators/client/types.d.ts
@@ -16,6 +16,7 @@ export type FrontendApplication = ApplicationClientProperties &
     clientWebappDir?: string;
     webappEnumerationsDir?: string;
     clientFrameworkBuiltIn?: boolean;
+    frontendAppName?: string;
   };
 
 /**

diff --git a/generators/server/support/prepare-relationship.ts b/generators/server/support/prepare-relationship.ts
@@ -1,8 +1,9 @@
 import type { Relationship } from '../../../lib/types/application/relationship.js';
 import { mutateData } from '../../../lib/utils/object.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
+import type { Entity } from '../../../lib/types/application/index.js';
 
-export function prepareRelationship({ relationship }: { relationship: Relationship; entity: any }) {
+export function prepareRelationship({ relationship }: { relationship: Relationship; entity: Entity }) {
   if (relationship.documentation) {
     mutateData(relationship, {
       __override__: false,

diff --git a/lib/types/application/entity.d.ts b/lib/types/application/entity.d.ts
@@ -51,8 +51,8 @@ export interface Entity<F extends BaseField = Field, R extends BaseRelationship
   changelogDateForRecent: any;
   /** @experimental */
   auditableEntity?: boolean;
-  relationships: (IsNever<R> extends true ? Relationship<Omit<Entity, 'relationships'>> : R)[];
-  otherRelationships: (IsNever<R> extends true ? Relationship<Omit<Entity, 'relationships'>> : R)[];
+  relationships: (IsNever<R> extends true ? Relationship : R)[];
+  otherRelationships: (IsNever<R> extends true ? Relationship : R)[];
 
   primaryKey?: PrimaryKey<F>;