@solidstarters/solid-code-builder 1.0.13 → 1.0.14

package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts

@@ -45,6 +45,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     protected readonly moduleName: string,
     protected readonly modelName: string,
     protected readonly field: any,
+    protected readonly modelEnableSoftDelete?: any
   ) {
     // TODO: Note that the source file instance is created during construction
     // So every operation should use a new instance of the field manager, so updated tree/source is used before each operation
@@ -52,14 +53,13 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
       tree,
       `src/${dasherize(moduleName)}/entities/${dasherize(modelName)}.entity.ts`,
     );
-
     const fieldPropertyDeclarationNode = this.getFieldIdentifierNode(
       this.fieldName(),
       this.source
     )?.parent as PropertyDeclaration | undefined;
 
     this.indexDecoratorManager = new IndexDecoratorManager(
-      { index: this.field.index, source: this.source, field: this.field },
+      { index: this.field.index, source: this.source, field: this.field, modelEnableSoftDelete: this.modelEnableSoftDelete },
       fieldPropertyDeclarationNode,
     );
     this.columnDecoratorManager = new ColumnDecoratorManager(
@@ -78,7 +78,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     this.manyToOneDecoratorManager = new ManyToOneDecoratorManager(
       {
         isManyToOne: this.isManyToOne(),
-        relationModelSingularName: this.field.relationModelSingularName,
+        relationCoModelSingularName: this.field.relationCoModelSingularName,
         relationCascade: this.field.relationCascade,
         required: this.field.required,
         source: this.source,
@@ -94,14 +94,14 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
         source: this.source,
         field: this.field,
         fieldName: this.fieldName(),
-        relationModelFieldName: this.field.relationModelFieldName
+        relationCoModelColumnName: this.field.relationCoModelColumnName
       },
     );
     this.manyToManyDecoratorManager = new ManyToManyDecoratorManager(
       {
         isManyToMany: this.isManyToMany(),
-        relationModelName: this.field.relationModelSingularName,
-        relationInverseFieldName: this.field.relationModelFieldName,
+        relationModelName: this.field.relationCoModelSingularName,
+        relationInverseFieldName: this.field.relationCoModelFieldName,
         relationCascade: this.field.relationCascade,
         owner: this.field.isRelationManyToManyOwner,
         source: this.source,
@@ -118,12 +118,12 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
         fieldName: this.fieldName(),
         modelName: this.modelName,
         relationJoinTableName: this.field.relationJoinTableName,
-        relationJoinColumnName: this.field.relationJoinColumnName,
-        joinColumnName: this. field.joinColumnName
+        relationJoinColumnName: this.field.relationCoModelColumnName,
+        joinColumnName: this.field.columnName
       },
     );
     this.uniqueIndexDecoratorManager = new UniqueIndexDecoratorManager(
-      { unique: this.field.unique, fieldName: this.fieldName(), source: this.source, field: this.field },
+      { unique: this.field.unique, fieldName: this.fieldName(), source: this.source, field: this.field, modelEnableSoftDelete: this.modelEnableSoftDelete},
       this.getClassNode(this.modelName, this.source)
     );
     this.oneToManyDecoratorManager = new OneToManyDecoratorManager(
@@ -457,7 +457,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
   }
 
   protected inverseRelationFieldName(): string {
-    return `${this.field.relationModelSingularName}s`;
+    return `${this.field.relationCoModelSingularName}s`;
   }
 
 

package/src/code-builder/lib/field/field-managers/bigint/BigIntFieldHandler.ts

@@ -6,12 +6,13 @@ export class BigIntFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new BigIntFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new BigIntFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/bigint/BigIntFieldManagerForEntity.ts

@@ -9,8 +9,8 @@ export class BigIntFieldManagerForEntity
 {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/boolean/BooleanFieldHandler.ts

@@ -6,12 +6,13 @@ export class BooleanFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new BooleanFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new BooleanFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/boolean/BooleanFieldManagerForEntity.ts

@@ -9,8 +9,8 @@ export class BooleanFieldManagerForEntity
 {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/computed/ComputedFieldHandler.ts

@@ -11,12 +11,14 @@ export class ComputedFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
+    modelEnableSoftDelete: any
   ) {
     this.entityFieldManager = new ComputedFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete,
     );
     //Instantiate the entity and dto source files
   }

package/src/code-builder/lib/field/field-managers/computed/ComputedFieldManagerForEntity.ts

@@ -8,8 +8,8 @@ export class ComputedFieldManagerForEntity
   implements FieldManager {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/date/DateFieldHandler.ts

@@ -6,12 +6,13 @@ export class DateFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new DateFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new DateFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/date/DateFieldManagerForEntity.ts

@@ -8,8 +8,8 @@ export class DateFieldManagerForEntity
   implements FieldManager {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/decimal/DecimalFieldHandler.ts

@@ -6,12 +6,13 @@ export class DecimalFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new DecimalFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new DecimalFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/decimal/DecimalFieldManagerForEntity.ts

@@ -9,8 +9,8 @@ export class DecimalFieldManagerForEntity
 {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/email/EmailFieldHandler.ts

@@ -13,12 +13,14 @@ export class EmailFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
+    modelEnableSoftDelete: any
   ) {
     this.entityFieldManager = new EmailFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new EmailFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/email/EmailFieldManagerForEntity.ts

@@ -9,8 +9,8 @@ export class EmailFieldManagerForEntity
   extends BaseFieldManagerForEntity
   implements FieldManager {
   source: ts.SourceFile;
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
 
   }
 

package/src/code-builder/lib/field/field-managers/int/IntFieldHandler.ts

@@ -7,12 +7,13 @@ export class IntFieldHandler implements FieldHandler {
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
 
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new IntFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new IntFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/int/IntFieldManagerForEntity.ts

@@ -10,8 +10,8 @@ export class IntFieldManagerForEntity
 {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/json/JsonFieldHandler.ts

@@ -13,12 +13,14 @@ export class JsonFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
+    modelEnableSoftDelete: any
   ) {
     this.entityFieldManager = new JsonFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new JsonFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/json/JsonFieldManagerForEntity.ts

@@ -8,8 +8,8 @@ export class JsonFieldManagerForEntity
   implements FieldManager {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/long-text/LongTextFieldHandler.ts

@@ -13,12 +13,14 @@ export class LongTextFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
+    modelEnableSoftDelete: any
   ) {
     this.entityFieldManager = new LongTextFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new LongTextFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts

@@ -10,8 +10,8 @@ export class LongTextFieldManagerForEntity
 {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
   }
 
   fieldType(): FieldType {

package/src/code-builder/lib/field/field-managers/password/PasswordFieldHandler.ts

@@ -13,12 +13,14 @@ export class PasswordFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
+    modelEnableSoftDelete: any
   ) {
     this.entityFieldManager = new PasswordFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new PasswordFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/password/PasswordFieldManagerForEntity.ts

@@ -7,8 +7,8 @@ export class PasswordFieldManagerForEntity
   extends BaseFieldManagerForEntity
   implements FieldManager {
   source: ts.SourceFile;
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any) {
-    super(tree, moduleName, modelName, field);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
 
   }
 

package/src/code-builder/lib/field/field-managers/relation/ManyToManyInverseRelationFieldHandler.ts

@@ -7,12 +7,13 @@ export class ManyToManyInverseRelationFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new ManyToManyInverseRelationFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new ManyToManyInverseRelationFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldHandler.ts

@@ -6,12 +6,13 @@ export class ManyToManyRelationFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new ManyToManyRelationFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new ManyToManyRelationFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts

@@ -8,6 +8,7 @@ import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecor
 import { TransformDecoratorManager } from '../../decorator-managers/dto/TransformDecoratorManager';
 import { DecoratorType, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, safeInsertImport } from '../../FieldManager';
 import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
+import { ApiPropertyDecoratorManager } from '../../decorator-managers/dto/ApiPropertyDecoratorManager';
 
 export class ManyToManyRelationFieldManagerForDto
     extends BaseFieldManagerForDto
@@ -28,7 +29,7 @@ export class ManyToManyRelationFieldManagerForDto
             DecoratorType.ValidateNested,
         )];
         this.decoratorManagers.push(
-            new TransformDecoratorManager({ isTransform: true, type: this.transformType(this.field.relationModelSingularName), source: this.source, field: field })
+            new TransformDecoratorManager({ isTransform: true, type: this.transformType(this.field.relationCoModelSingularName), source: this.source, field: field })
         );
         
     }
@@ -66,7 +67,7 @@ export class ManyToManyRelationFieldManagerForDto
 
     // This is the field type of the owner in the m2m relation
     fieldType(): FieldType {
-        return this.manyToManyFieldType(this.field.relationModelSingularName)
+        return this.manyToManyFieldType(this.field.relationCoModelSingularName)
     }
 
     private transformType(forModelName: string): string {
@@ -106,7 +107,8 @@ export class ManyToManyRelationFieldManagerForDto
         const modelName = this.modelName        
         const decoratorManagers = [
             new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
-            new ArrayDecoratorManager({ isArray: true, source: source, field: field })
+            new ArrayDecoratorManager({ isArray: true, source: source, field: field }),
+            new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
         ]
 
         return this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source);
@@ -121,6 +123,7 @@ export class ManyToManyRelationFieldManagerForDto
         const decoratorManagers = [
             new StringDecoratorManager({ isString: true, source: source, field: field }),
             new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+            new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
             // TODO pending @IsEnum(RelationFieldsCommand) 
         ]
 
@@ -176,7 +179,8 @@ export class ManyToManyRelationFieldManagerForDto
             const fieldType = ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
             const decoratorManagers = [
                 new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
-                new ArrayDecoratorManager({ isArray: true, source: source, field: field })
+                new ArrayDecoratorManager({ isArray: true, source: source, field: field }),
+                new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
             ];
             return this.updateFieldInternal(idsFieldName, fieldType, decoratorManagers, field, source);
         }
@@ -203,6 +207,7 @@ export class ManyToManyRelationFieldManagerForDto
             const decoratorManagers = [
                 new StringDecoratorManager({ isString: true, source: source, field: field }),
                 new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+                new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
                 // TODO pending @IsEnum(RelationFieldsCommand) 
             ];
             return this.updateFieldInternal(commandFieldName, fieldType, decoratorManagers, field, source);
@@ -242,7 +247,7 @@ export class ManyToManyRelationFieldManagerForDto
 
     override addField(): FieldChange[] {
         const fieldChanges: FieldChange[] = super.addField();
-        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) {
             const mainField = fieldChanges[0];
             mainField.changes.push(this.relatedFieldImport());
         }
@@ -257,7 +262,7 @@ export class ManyToManyRelationFieldManagerForDto
         // if (containsAddFieldChanges) return fieldChanges;
 
         //This line is required to add import changes in the update context
-        // if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+        // if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) {
             const mainField = fieldChanges[0];
             mainField.changes.push(this.relatedFieldImport());
         // }
@@ -265,9 +270,9 @@ export class ManyToManyRelationFieldManagerForDto
     }
 
     relatedFieldImport(): Change {
-        const relatedEntityImportName = `update-${dasherize(this.field.relationModelSingularName)}.dto`;
+        const relatedEntityImportName = `update-${dasherize(this.field.relationCoModelSingularName)}.dto`;
         const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-        return safeInsertImport(this.source, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
-        // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
+        return safeInsertImport(this.source, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
+        // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath);
     } //Uncomment this method while implementing many-to-many relation changes
 }

package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts

@@ -19,7 +19,7 @@ export class ManyToManyRelationFieldManagerForEntity
     }
 
     private manyToManyFieldType(): FieldType {
-        const type = `${classify(this.field.relationModelSingularName)}`
+        const type = `${classify(this.field.relationCoModelSingularName)}`
         const text = `${type}[]`
         return {
             text: text,
@@ -34,7 +34,7 @@ export class ManyToManyRelationFieldManagerForEntity
 
     override addField(): FieldChange[] {
         const fieldChanges = super.addField();
-        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) {
             const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
             mainField.changes.push(this.relatedFieldImport());
         }
@@ -43,7 +43,7 @@ export class ManyToManyRelationFieldManagerForEntity
 
     override updateField(): FieldChange[] {
         const fieldChanges = super.updateField();
-        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) {
             const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
             mainField.changes.push(this.relatedFieldImport());
         }
@@ -51,9 +51,9 @@ export class ManyToManyRelationFieldManagerForEntity
     }
 
     relatedFieldImport(): Change {
-        const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
+        const relatedEntityImportName = `${dasherize(this.field.relationCoModelSingularName)}.entity`;
         const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-        return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
+        return safeInsertImport(this.source, classify(this.field.relationCoModelSingularName), relatedEntityPath, this.moduleName);
     }
 
 }

package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldHandler.ts

@@ -7,12 +7,13 @@ export class ManyToOneRelationFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new ManyToOneRelationFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new ManyToOneRelationFieldManagerForDto(
       tree,

package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts

@@ -4,6 +4,7 @@ import { OptionalDecoratorManager } from '../../decorator-managers/dto/OptionalD
 import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
 import { FieldChange, FieldManager, FieldType, ManagerForDtoOptions } from '../../FieldManager';
 import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
+import { ApiPropertyDecoratorManager } from '../../decorator-managers/dto/ApiPropertyDecoratorManager';
 
 export class ManyToOneRelationFieldManagerForDto
   extends BaseFieldManagerForDto
@@ -79,6 +80,7 @@ export class ManyToOneRelationFieldManagerForDto
     const decoratorManagers = [
       new StringDecoratorManager({ isString: true, source: source, field: field }),
       new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+      new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
     ];
 
     const fieldChange = this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source);
@@ -103,6 +105,7 @@ export class ManyToOneRelationFieldManagerForDto
         const decoratorManagers = [
             new StringDecoratorManager({ isString: true, source: source, field: field }),
             new OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+            new ApiPropertyDecoratorManager({isApplyApiProperty: true, source: source, field: field})
             // TODO pending @IsEnum(RelationFieldsCommand) 
         ]
  

package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts

@@ -16,10 +16,10 @@ export class ManyToOneRelationFieldManagerForEntity
 
   private manyToOneFieldType(): FieldType {
     return {
-      text: classify(this.field.relationModelSingularName),
+      text: classify(this.field.relationCoModelSingularName),
       node: (field: any) => ts.factory.createTypeReferenceNode(
         ts.factory.createIdentifier(
-          classify(field.relationModelSingularName)
+          classify(field.relationCoModelSingularName)
         ),
         undefined
       ),
@@ -28,7 +28,7 @@ export class ManyToOneRelationFieldManagerForEntity
 
   override addField(): FieldChange[] {
     const fieldChanges = super.addField();
-    if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) { 
+    if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) { 
       const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
       mainField.changes.push(this.relatedFieldImport());
     }
@@ -37,7 +37,7 @@ export class ManyToOneRelationFieldManagerForEntity
 
   override updateField(): FieldChange[] {
     const fieldChanges = super.updateField();
-    if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) { 
+    if (fieldChanges.length > 0 && this.modelName !== this.field.relationCoModelSingularName) { 
       const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
       mainField.changes.push(this.relatedFieldImport());
     }
@@ -45,9 +45,9 @@ export class ManyToOneRelationFieldManagerForEntity
   }
 
   relatedFieldImport(): Change {
-    const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
+    const relatedEntityImportName = `${dasherize(this.field.relationCoModelSingularName)}.entity`;
     const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-    return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
+    return safeInsertImport(this.source, classify(this.field.relationCoModelSingularName), relatedEntityPath, this.moduleName);
   }
 
   

package/src/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldHandler.ts

@@ -7,12 +7,13 @@ export class OneToManyRelationFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
   createDtoFieldManager: FieldManager;
   updateDtoFieldManager: FieldManager;
-  constructor(tree: any, moduleName: string, modelName: string, field: any) {
+  constructor(tree: any, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
     this.entityFieldManager = new OneToManyRelationFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
+      modelEnableSoftDelete
     );
     this.createDtoFieldManager = new OneToManyRelationFieldManagerForDto(
       tree,