@solidstarters/solid-code-builder 1.0.11 → 1.0.13

package/dist/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForDto.js

@@ -0,0 +1,202 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneToManyRelationFieldManagerForDto = void 0;
+const strings_1 = require("@angular-devkit/core/src/utils/strings");
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ArrayDecoratorManager_1 = require("../../decorator-managers/dto/ArrayDecoratorManager");
+const OptionalDecoratorManager_1 = require("../../decorator-managers/dto/OptionalDecoratorManager");
+const StringDecoratorManager_1 = require("../../decorator-managers/dto/StringDecoratorManager");
+const TransformDecoratorManager_1 = require("../../decorator-managers/dto/TransformDecoratorManager");
+const FieldManager_1 = require("../../FieldManager");
+const BaseFieldManagerForDto_1 = require("../base/BaseFieldManagerForDto");
+class OneToManyRelationFieldManagerForDto extends BaseFieldManagerForDto_1.BaseFieldManagerForDto {
+    isJson() {
+        return false;
+    }
+    isBoolean() {
+        return false;
+    }
+    constructor(tree, moduleName, modelName, field, options) {
+        super(tree, moduleName, modelName, Object.assign(Object.assign({}, field), { required: false }), options);
+        this.decoratorManagers = [...this.decoratorManagers, ...this.getFieldDecoratorManagers(this.field, this.source, FieldManager_1.DecoratorType.Array, FieldManager_1.DecoratorType.ValidateNested)];
+        this.decoratorManagers.push(new TransformDecoratorManager_1.TransformDecoratorManager({ isTransform: true, type: this.transformType(), source: this.source, field: field }));
+    }
+    isString() {
+        return false;
+    }
+    isNumber() {
+        return false;
+    }
+    isInt() {
+        return false;
+    }
+    isDecimal() {
+        return false;
+    }
+    isApplyRegex() {
+        return false;
+    }
+    isApplyRequired() {
+        return false;
+    }
+    isApplyMin() {
+        return false;
+    }
+    isApplyMax() {
+        return false;
+    }
+    isDate() {
+        return false;
+    }
+    isTransform() {
+        return false;
+    }
+    // This field type is used in the case of one-to-many relation, when we generate the inverse field in the related entity
+    fieldType() {
+        const type = this.transformType(); //TODO Discuss if this needs to be Create Or Update DTO
+        const text = `${type}[]`;
+        return {
+            text: text,
+            node: (_field) => typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier(type), undefined)),
+        };
+    }
+    transformType() {
+        return `Update${(0, strings_1.classify)(this.field.relationModelSingularName)}Dto`;
+    }
+    addField() {
+        const fieldChanges = super.addField();
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+            const mainField = fieldChanges[0];
+            mainField.changes.push(this.relatedFieldImport());
+        }
+        return fieldChanges;
+    }
+    addAdditionalField() {
+        const fieldChanges = [];
+        // Add the ids field to the main entity
+        fieldChanges.push(this.addAdditionalIdsField());
+        // Add the command field to the main entity
+        fieldChanges.push(this.addAdditionalCommandField());
+        return fieldChanges;
+    }
+    addAdditionalIdsField() {
+        const fieldName = `${this.field.name}Ids`;
+        const fieldType = "number[]";
+        const source = this.source;
+        const field = this.field;
+        const modelName = this.modelName;
+        const decoratorManagers = [
+            new OptionalDecoratorManager_1.OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+            new ArrayDecoratorManager_1.ArrayDecoratorManager({ isArray: true, source: source, field: field })
+        ];
+        return this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source);
+    }
+    addAdditionalCommandField() {
+        const fieldName = `${this.field.name}Command`;
+        const fieldType = "string";
+        const source = this.source;
+        const field = this.field;
+        const modelName = this.modelName;
+        const decoratorManagers = [
+            new StringDecoratorManager_1.StringDecoratorManager({ isString: true, source: source, field: field }),
+            new OptionalDecoratorManager_1.OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+            // TODO pending @IsEnum(RelationFieldsCommand) 
+        ];
+        return this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source);
+    }
+    updateField() {
+        const fieldChanges = super.updateField();
+        //FIXME This might not be required, since addField might never be called from within updateField
+        // const containsAddFieldChanges = fieldChanges.filter((change) => !(change instanceof InsertChange));
+        // 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) {
+        const mainField = fieldChanges[0];
+        mainField.changes.push(this.relatedFieldImport());
+        // }
+        return fieldChanges;
+    }
+    addOrUpdateAdditionalField() {
+        const fieldChanges = [];
+        // Add or update the ids field
+        fieldChanges.push(this.updateAdditionalIdsField());
+        // Add or update the command field
+        fieldChanges.push(this.updateAdditionalCommandField());
+        return fieldChanges;
+    }
+    updateAdditionalIdsField() {
+        var _a;
+        const idsFieldName = `${this.field.name}Ids`;
+        const source = this.source;
+        const field = this.field;
+        // Handle the main source additional fields
+        // Add or update the ids field
+        const idsField = (_a = this.getFieldIdentifierNode(idsFieldName, source)) === null || _a === void 0 ? void 0 : _a.parent;
+        if (idsField == null) {
+            return this.addAdditionalIdsField();
+        }
+        else {
+            //Update the ids field
+            const fieldType = typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.NumberKeyword));
+            const decoratorManagers = [
+                new OptionalDecoratorManager_1.OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+                new ArrayDecoratorManager_1.ArrayDecoratorManager({ isArray: true, source: source, field: field })
+            ];
+            return this.updateFieldInternal(idsFieldName, fieldType, decoratorManagers, field, source);
+        }
+    }
+    updateAdditionalCommandField() {
+        var _a;
+        const commandFieldName = `${this.field.name}Command`;
+        const source = this.source;
+        const field = this.field;
+        // Handle the main source additional fields
+        // Add or update the command field
+        const commandField = (_a = this.getFieldIdentifierNode(commandFieldName, source)) === null || _a === void 0 ? void 0 : _a.parent;
+        if (commandField == null) {
+            return this.addAdditionalCommandField();
+        }
+        else {
+            //Update the command field
+            const fieldType = typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword);
+            const decoratorManagers = [
+                new StringDecoratorManager_1.StringDecoratorManager({ isString: true, source: source, field: field }),
+                new OptionalDecoratorManager_1.OptionalDecoratorManager({ isApplyOptional: true, optional: true, source: source, field: field }),
+                // TODO pending @IsEnum(RelationFieldsCommand) 
+            ];
+            return this.updateFieldInternal(commandFieldName, fieldType, decoratorManagers, field, source);
+        }
+    }
+    removeAdditionalField() {
+        const fieldChanges = [];
+        // Add the ids field to the main entity
+        fieldChanges.push(this.removeAdditionalIdsField());
+        // Add the command field to the main entity
+        fieldChanges.push(this.removeAdditionalCommandField());
+        return fieldChanges;
+    }
+    removeAdditionalIdsField() {
+        const fieldName = `${this.field.name}Ids`;
+        const source = this.source;
+        return this.removeFieldFor(fieldName, source);
+    }
+    removeAdditionalCommandField() {
+        const fieldName = `${this.field.name}Command`;
+        const source = this.source;
+        return this.removeFieldFor(fieldName, source);
+    }
+    isAdditionalFieldRequired() {
+        return true;
+    }
+    relatedFieldImport() {
+        const relatedEntityImportName = `update-${(0, strings_1.dasherize)(this.field.relationModelSingularName)}.dto`;
+        const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
+        return (0, FieldManager_1.safeInsertImport)(this.source, `Update${(0, strings_1.classify)(this.field.relationModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
+        // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
+    } //Uncomment this method while implementing many-to-many relation changes
+}
+exports.OneToManyRelationFieldManagerForDto = OneToManyRelationFieldManagerForDto;
+//# sourceMappingURL=OneToManyRelationFieldManagerForDto.js.map

package/dist/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OneToManyRelationFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForDto.ts"],"names":[],"mappings":"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"}

package/dist/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForEntity.d.ts

@@ -0,0 +1,9 @@
+import { Change } from '@schematics/angular/utility/change';
+import { FieldChange, FieldManager, FieldType } from '../../FieldManager';
+import { BaseFieldManagerForEntity } from '../base/BaseFieldManagerForEntity';
+export declare class OneToManyRelationFieldManagerForEntity extends BaseFieldManagerForEntity implements FieldManager {
+    addField(): FieldChange[];
+    updateField(): FieldChange[];
+    relatedFieldImport(): Change;
+    fieldType(): FieldType;
+}

package/dist/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForEntity.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneToManyRelationFieldManagerForEntity = void 0;
+const strings_1 = require("@angular-devkit/core/src/utils/strings");
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const FieldManager_1 = require("../../FieldManager");
+const BaseFieldManagerForEntity_1 = require("../base/BaseFieldManagerForEntity");
+class OneToManyRelationFieldManagerForEntity extends BaseFieldManagerForEntity_1.BaseFieldManagerForEntity {
+    addField() {
+        const fieldChanges = super.addField();
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+            const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
+            mainField.changes.push(this.relatedFieldImport());
+        }
+        return fieldChanges;
+    }
+    updateField() {
+        const fieldChanges = super.updateField();
+        if (fieldChanges.length > 0 && this.modelName !== this.field.relationModelSingularName) {
+            const mainField = fieldChanges[0]; // The 1st field change is the main field change, related to the entity source file
+            mainField.changes.push(this.relatedFieldImport());
+        }
+        return fieldChanges;
+    }
+    relatedFieldImport() {
+        const relatedEntityImportName = `${(0, strings_1.dasherize)(this.field.relationModelSingularName)}.entity`;
+        const relatedEntityPath = this.field.relationModelModuleName ? `src/${(0, strings_1.dasherize)(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
+        return (0, FieldManager_1.safeInsertImport)(this.source, (0, strings_1.classify)(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
+    }
+    fieldType() {
+        const type = `${(0, strings_1.classify)(this.field.relationModelSingularName)}`;
+        const text = `${type}[]`;
+        return {
+            text: text,
+            node: (_field) => typescript_1.default.factory.createArrayTypeNode(typescript_1.default.factory.createTypeReferenceNode(typescript_1.default.factory.createIdentifier(type), undefined)),
+        };
+    }
+}
+exports.OneToManyRelationFieldManagerForEntity = OneToManyRelationFieldManagerForEntity;
+//# sourceMappingURL=OneToManyRelationFieldManagerForEntity.js.map

package/dist/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForEntity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OneToManyRelationFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/OneToManyRelationFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA6E;AAC7E,gIAAgG;AAEhG,qDAA4F;AAC5F,iFAE2C;AAE3C,MAAa,sCACX,SAAQ,qDAAyB;IAGxB,QAAQ;QACf,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACvF,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,mFAAmF;YACtH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAEQ,WAAW;QAClB,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACvF,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,mFAAmF;YACtH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,kBAAkB;QAChB,MAAM,uBAAuB,GAAG,GAAG,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC;QAC5F,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,aAAa,uBAAuB,EAAE,CAAC,CAAC,CAAC,KAAK,uBAAuB,EAAE,CAAC;QAC3L,OAAO,IAAA,+BAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3H,CAAC;IAGD,SAAS;QACP,MAAM,IAAI,GAAG,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,CAAA;QAChE,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,CAAA;QACxB,OAAO;YACL,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,CAAC,MAAW,EAAE,EAAE,CACpB,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC/D,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EACjC,SAAS,CACV,CAAC;SACL,CAAC;IACJ,CAAC;CAEF;AA1CD,wFA0CC"}

package/dist/files/generate-model/controllers/__model@dasherize__.controller.ts

@@ -5,6 +5,11 @@ import { <%= classify(model) %>Service } from '../services/<%= dasherize(model)
 import { Create<%= classify(model) %>Dto } from '../dtos/create-<%= dasherize(model) %>.dto';
 import { Update<%= classify(model) %>Dto } from '../dtos/update-<%= dasherize(model) %>.dto';
 
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
 @ApiTags('<%= unSnakeCase(moduleDisplayName) %>')
 @Controller('<%= dasherize(model) %>')
 export class <%= classify(model) %>Controller {
@@ -52,8 +57,7 @@ export class <%= classify(model) %>Controller {
   }
     
   @ApiBearerAuth("jwt")
-  @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
-  @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
   @ApiQuery({ name: 'limit', required: false, type: Number })
   @ApiQuery({ name: 'offset', required: false, type: Number })
   @ApiQuery({ name: 'fields', required: false, type: Array })

package/files/generate-model/controllers/__model@dasherize__.controller.ts

@@ -5,6 +5,11 @@ import { <%= classify(model) %>Service } from '../services/<%= dasherize(model)
 import { Create<%= classify(model) %>Dto } from '../dtos/create-<%= dasherize(model) %>.dto';
 import { Update<%= classify(model) %>Dto } from '../dtos/update-<%= dasherize(model) %>.dto';
 
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
 @ApiTags('<%= unSnakeCase(moduleDisplayName) %>')
 @Controller('<%= dasherize(model) %>')
 export class <%= classify(model) %>Controller {
@@ -52,8 +57,7 @@ export class <%= classify(model) %>Controller {
   }
     
   @ApiBearerAuth("jwt")
-  @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
-  @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
   @ApiQuery({ name: 'limit', required: false, type: Number })
   @ApiQuery({ name: 'offset', required: false, type: Number })
   @ApiQuery({ name: 'fields', required: false, type: Array })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-code-builder",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "This package is use to generate code for the @solidstarters projects",
   "private": false,
   "publishConfig": {

package/src/code-builder/lib/field/FieldManager.ts

@@ -20,6 +20,8 @@ import { RichTextFieldHandler } from './field-managers/rich-text/RichTextFieldHa
 import { ShortTextFieldHandler } from './field-managers/short-text/ShortTextFieldHandler';
 import { UUIDFieldHandler } from './field-managers/uuid/UUIDFieldHandler';
 import { SOLID_CORE_MODULE_NAME, SOLID_CORE_MODULE_NPM_PACKAGE_NAME } from '../model/helpers';
+import { OneToManyRelationFieldHandler } from './field-managers/relation/OneToManyRelationFieldHandler';
+import { ManyToManyInverseRelationFieldHandler } from './field-managers/relation/ManyToManyInverseRelationFieldHandler';
 
 export const MAX_EMAIL_LENGTH = 254;
 export const UUID_REGEX = `^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`;
@@ -212,13 +214,23 @@ export function getFieldHandler(
     case SolidFieldType.datetime:
     case SolidFieldType.time:
       return new DateFieldHandler(tree, moduleName, modelName, field);
-    case SolidFieldType.relation:
-      if (field.relationType === RelationType.ManyToMany) {
-        return new ManyToManyRelationFieldHandler(tree, moduleName, modelName, field);
-      }
-      else {
+    case SolidFieldType.relation: {
+      if (field.relationType === RelationType.ManyToOne) {
         return new ManyToOneRelationFieldHandler(tree, moduleName, modelName, field);
       }
+      else if (field.relationType === RelationType.OneToMany) {
+        return new OneToManyRelationFieldHandler(tree, moduleName, modelName, field);
+      }
+      else if (field.relationType === RelationType.ManyToMany) {
+        if (field.isRelationManyToManyOwner) {
+          return new ManyToManyRelationFieldHandler(tree, moduleName, modelName, field);
+        }
+        else {
+          return new ManyToManyInverseRelationFieldHandler(tree, moduleName, modelName, field);
+        }
+      }
+      return new NoOpsFieldHandler(tree, moduleName, modelName, field);
+    }
     case SolidFieldType.mediaSingle:
     case SolidFieldType.mediaMultiple:
       return new NoOpsFieldHandler(tree, moduleName, modelName, field);
@@ -269,7 +281,8 @@ export function getClassExportKeywordNode (className: string, sourceFile: ts.Sou
 
 export enum RelationType {
   ManyToOne = 'many-to-one',
-  ManyToMany = 'many-to-many'
+  ManyToMany = 'many-to-many',
+  OneToMany = "one-to-many"
 }
 
 export enum DtoSourceType {

package/src/code-builder/lib/field/decorator-managers/entity/IndexDecoratorManager.ts

@@ -13,7 +13,7 @@ export class IndexDecoratorManager implements DecoratorManager {
 
     constructor(public options: IndexDecoratorOptions, public fieldNode?: PropertyDeclaration) { }
     isApplyDecorator(): boolean {
-        return this.options.index && this.options.field.relationType !== RelationType.ManyToMany;
+        return this.options.index && this.options.field.relationType !== RelationType.ManyToMany && this.options.field.relationType !== RelationType.OneToMany;
     }
     decoratorName(): string {
         return 'Index';

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

@@ -1,6 +1,7 @@
 import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 import { Tree } from '@angular-devkit/schematics';
 import ts, {
+  ClassDeclaration,
   PropertyDeclaration,
   SourceFile,
 } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
@@ -48,6 +49,7 @@ import { ApiPropertyDecoratorManager } from '../../decorator-managers/dto/ApiPro
 // The validation decorators added use the class-validator library
 export abstract class BaseFieldManagerForDto implements FieldManager {
   source: SourceFile;
+  updatedSourceClassNode?: ts.ClassDeclaration;
   decoratorManagers: DecoratorManager[];
 
   constructor(
@@ -137,7 +139,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
   protected addFieldInternal(fieldName: string, fieldType: string, decoratorManagers: DecoratorManager[], field: any, modelName: any, source: ts.SourceFile): FieldChange {
     //FIXME There might a case where the main field is not present, but additional field is present. Do we update the fields or throw an error. Needs to be discussed
     // For now, we assume, that if primary field is not present, then additional field is also not present
-    if (this.isFieldPresent(fieldName, source)) { 
+    if (this.isFieldPresent(fieldName, source)) {
       return {
         filePath: source.fileName,
         field: field,
@@ -166,14 +168,8 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
       fieldSourceLines.push(...builderChange.fieldSourceLines);
     });
 
-    // Create the field definition changes
-    // const classNode = findNodes(source, ts.SyntaxKind.ClassDeclaration)[0];
-    const className = (this.options.sourceType === DtoSourceType.Create) ? `Create${classify(modelName)}Dto` : `Update${classify(modelName)}Dto`;
-    const classNode = getClassNode(className,source);
-    if (!classNode) {
-      throw new Error(`Class ${className} not found in file ${source.fileName}`);
-    }
-    
+    const classNode = this.getClassNode(modelName, this.options, source);
+
     const fieldDefinition = `\n${fieldSourceLines.reverse().join('\n')}\n`;
     changes.push(
       new InsertChange(
@@ -208,9 +204,9 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
 
     const fieldName = this.fieldName();
     const fieldType = this.fieldType().text;
-    const source= this.source
+    const source = this.source
     const field = this.field
-    const modelName = this.modelName        
+    const modelName = this.modelName
     const decoratorManagers = this.decoratorManagers;
 
     fieldChanges.push(this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source));
@@ -241,7 +237,20 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
     changes.push(...decoratorChanges);
 
-    changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+    // changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+
+    // if (!this.isAdditionalFieldRequired()) {
+      // Get the source class node i.e CreateDto or UpdateDto
+      const sourceClassNode = this.getClassNode(this.modelName, this.options, source); // FIXME Avoid this.model to avoid stateful behaviour
+      const classNode = this.updatedSourceClassNode ?? sourceClassNode;
+      // Set the updated property declaration node to the source class node
+      const updatedClassNode = this.updateClassNode(classNode, updatedPropertyDeclarationNode, fieldName);
+      this.updatedSourceClassNode = updatedClassNode; // Set the updated class node to the source class node, so it can be used for additional operations e.g for additional field updates
+      changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), sourceClassNode, source.fileName)); 
+    // }
+    // else {
+    //   changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source.fileName));
+    // }
 
     return {
       filePath: source.fileName,
@@ -250,6 +259,32 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     };
   }
 
+  updateClassNode(sourceClassNode: ts.ClassDeclaration, updatedFieldNode: ts.PropertyDeclaration, fieldName: string): ClassDeclaration {
+    // Replace the class memeber matching the field name with the updated field node
+    const newMembers = sourceClassNode.members.map((member) => {
+      // Check if the member is a PropertyDeclaration
+      if (ts.isPropertyDeclaration(member)) {
+        // Compare the name of the property with the field name
+        const memberName = member.name.getText();
+        if (memberName === fieldName) {
+          return updatedFieldNode!;
+        }
+      }
+      return member;
+    });
+
+    // Update the class node with the new modifiers
+    const updatedClass = ts.factory.updateClassDeclaration(
+      sourceClassNode,
+      sourceClassNode.modifiers,
+      sourceClassNode.name,
+      sourceClassNode.typeParameters,
+      sourceClassNode.heritageClauses,
+      newMembers,
+    );
+    return updatedClass;
+  }
+
   updateField(): FieldChange[] {
     const fieldChanges: FieldChange[] = [];
 
@@ -257,7 +292,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
 
     const fieldName = this.fieldName();
     const fieldType = this.fieldType().node(this.field);
-    const source= this.source
+    const source = this.source
     const field = this.field
     const decoratorManagers = this.decoratorManagers;
 
@@ -365,7 +400,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
         }
       }
     }
-  }  
+  }
 
   protected applyBuildDecoratorTransformations(...transformers: DecoratorManager[]): PartialAddFieldChange[] {
     const partialFieldChanges: PartialAddFieldChange[] = [];
@@ -385,24 +420,24 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     }
   }
 
-  protected calculateReplaceChanges(updatedPropertyDeclarationNodeText: string, fieldPropertyDeclarationNode: ts.PropertyDeclaration, source: ts.SourceFile): Change[] {
+  protected calculateReplaceChanges(updatedSourceNodeText: string, sourceNode:ts.Node, sourceFileName: string): Change[] {
     const changes: Change[] = [];
-    if (updatedPropertyDeclarationNodeText.trim() !==
-      fieldPropertyDeclarationNode.getFullText().trim()) {
-      console.log(`Updated Code:\n${updatedPropertyDeclarationNodeText.trim()}\nwith length ${updatedPropertyDeclarationNodeText.trim().length}\n`);
-      console.log(`Old Code:\n${fieldPropertyDeclarationNode.getFullText().trim()}\nwith length ${fieldPropertyDeclarationNode.getFullText().trim().length}\n`);
+    if (updatedSourceNodeText.trim() !==
+      sourceNode.getFullText().trim()) {
+      console.log(`Updated Code:\n${updatedSourceNodeText.trim()}\nwith length ${updatedSourceNodeText.trim().length}\n`);
+      console.log(`Old Code:\n${sourceNode.getFullText().trim()}\nwith length ${sourceNode.getFullText().trim().length}\n`);
       const replaceChange = new ReplaceChangeSSS(
-        source.fileName,
-        fieldPropertyDeclarationNode.pos,
-        fieldPropertyDeclarationNode.getFullText(),
-        `\n\n${updatedPropertyDeclarationNodeText}`
+        sourceFileName,
+        sourceNode.pos,
+        sourceNode.getFullText(),
+        `\n\n${updatedSourceNodeText}`
       );
       changes.push(replaceChange);
     }
     return changes;
   }
 
-  protected printNode(updatedPropertyDeclarationNode: ts.PropertyDeclaration, nodeSource: SourceFile): string {
+  protected printNode(updatedPropertyDeclarationNode: ts.Node, nodeSource: SourceFile): string {
     const printer = ts.createPrinter({
       newLine: ts.NewLineKind.LineFeed,
       removeComments: false,
@@ -432,7 +467,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
         case DecoratorType.MinLength:
           return new MinLengthDecoratorManager({ isApplyMinLength: this.isApplyMinLength(), length: field.min, source: source, field: field });
         case DecoratorType.MaxLength:
-          return new MaxLengthDecoratorManager({ isApplyMaxLength: this.isApplyMaxLength(), length: field.max, source: source, field: field });  
+          return new MaxLengthDecoratorManager({ isApplyMaxLength: this.isApplyMaxLength(), length: field.max, source: source, field: field });
         case DecoratorType.Required:
           return new RequiredDecoratorManager({ isApplyRequired: true, required: field.required, source: source, field: field });
         case DecoratorType.Optional:
@@ -447,7 +482,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
           return new IntDecoratorManager({ isInt: this.isInt(), source: source, field: field });
         case DecoratorType.Decimal:
           return new DecimalDecoratorManager({ isDecimal: this.isDecimal(), source: source, field: field });
-        case DecoratorType.BigInt:  
+        case DecoratorType.BigInt:
           return new BigIntDecoratorManager({ isBigInt: this.isBigInt(), source: source, field: field });
         case DecoratorType.Date:
           return new DateDecoratorManager({ isDate: this.isDate(), source: source, field: field });
@@ -482,4 +517,17 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     }
   }
 
+  private getClassNode(modelName: any, options: ManagerForDtoOptions, source: ts.SourceFile) {
+    // if (this.updatedSourceClassNode) {
+    //   return this.updatedSourceClassNode;
+    // }
+    const classifiedModelName = classify(modelName);
+    const sourceClassName = (options.sourceType === DtoSourceType.Create) ? `Create${classifiedModelName}Dto` : `Update${classifiedModelName}Dto`;
+    const classNode = getClassNode(sourceClassName, source);
+    if (!classNode) {
+      throw new Error(`Class ${sourceClassName} not found in file ${source.fileName}`);
+    }
+    return classNode;
+  }
+
 }

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

@@ -28,6 +28,7 @@ import { JoinTableDecoratorManager } from '../../decorator-managers/entity/JoinT
 import { RelationType } from "../../FieldManager";
 import { UniqueIndexDecoratorManager } from '../../decorator-managers/entity/UniqueIndexDecoratorManager';
 import { JoinColumnDecoratorManager } from '../../decorator-managers/entity/JoinColumnDecoratorManager';
+import { OneToManyDecoratorManager } from '../../decorator-managers/entity/OneToManyDecoratorManager';
 
 export abstract class BaseFieldManagerForEntity implements FieldManager {
   source: SourceFile;
@@ -38,6 +39,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
   manyToManyDecoratorManager: DecoratorManager;
   joinTableDecoratorManager: DecoratorManager;
   uniqueIndexDecoratorManager: UniqueIndexDecoratorManager;
+  oneToManyDecoratorManager: OneToManyDecoratorManager;
   constructor(
     tree: Tree,
     protected readonly moduleName: string,
@@ -88,7 +90,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     );
     this.joinColumnDecoratorManager = new JoinColumnDecoratorManager(
       {
-        isManyToOneRelationOwner: this.field.relationType === RelationType.ManyToOne,
+        isManyToOneRelationOwner: this.isManyToOne(),
         source: this.source,
         field: this.field,
         fieldName: this.fieldName(),
@@ -101,7 +103,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
         relationModelName: this.field.relationModelSingularName,
         relationInverseFieldName: this.field.relationModelFieldName,
         relationCascade: this.field.relationCascade,
-        owner: true,
+        owner: this.field.isRelationManyToManyOwner,
         source: this.source,
         field: this.field,
         fieldName: this.fieldName(),
@@ -110,7 +112,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     );
     this.joinTableDecoratorManager = new JoinTableDecoratorManager(
       {
-        isManyToManyRelationOwner: this.field.relationType === RelationType.ManyToMany,
+        isManyToManyRelationOwner: this.isManyToMany() && this.field.isRelationManyToManyOwner,
         source: this.source,
         field: this.field,
         fieldName: this.fieldName(),
@@ -124,6 +126,17 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
       { unique: this.field.unique, fieldName: this.fieldName(), source: this.source, field: this.field },
       this.getClassNode(this.modelName, this.source)
     );
+    this.oneToManyDecoratorManager = new OneToManyDecoratorManager(
+      {
+        isOneToMany: this.isOneToMany(),
+        relationCascade: this.field.relationCascade,
+        source: this.source,
+        field: this.field,
+        fieldName: this.fieldName(),
+        modelName: this.modelName,
+      },
+    );
+
   }
 
   protected addFieldInternal(fieldName: string, fieldType: string, decoratorManagers: DecoratorManager[], field: any, modelName: any, source: ts.SourceFile): FieldChange {
@@ -452,6 +465,9 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     return (this.field.type === 'relation' && this.field.relationType === RelationType.ManyToOne);
   }
 
+  private isOneToMany(): boolean {
+    return (this.field.type === 'relation' && this.field.relationType === RelationType.OneToMany);
+  }
 
 
   protected isAdditionalFieldRequired(): boolean {