@solidxai/code-builder 0.0.2

package/src/code-builder/lib/field/decorator-managers/dto/ArrayDecoratorManager.ts

@@ -0,0 +1,130 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+export interface ArrayDecoratorOptions {
+    isArray: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export class ArrayDecoratorManager implements DecoratorManager {
+    constructor(public options: ArrayDecoratorOptions, public fieldNode?: any) { }
+    isApplyDecorator(): boolean {
+        return this.options.isArray;
+    }
+    buildDecorator(): PartialAddFieldChange {
+        const fieldSourceLines = [];
+        const changes: Change[] = [];
+        fieldSourceLines.push(`@${this.decoratorName()}()`);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+        this.fieldNode = fieldNode;
+    }
+
+    decoratorName(): string {
+        return 'IsArray';
+    }
+
+    decoratorImports(): Change[] {
+        return [insertImport(
+            this.options.source,
+            this.options.source.fileName,
+            this.decoratorName(),
+            'class-validator')]
+    }
+
+    updateDecorator(): [PropertyDeclaration, Change[]] {
+        if (!this.fieldNode) throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+
+        let newModifiers: ModifierLike[] = [];
+        let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.fieldNode.modifiers;
+
+        // Check if the field has an IsArray decorator.
+        const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+
+        //Remove the  decorator if the  decorator exists
+        //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+        newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+        //Add the  decorator, if it is required
+        const changes: Change[] = [];  
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+
+        const updatedProperty = ts.factory.updatePropertyDeclaration(
+            this.fieldNode,
+            newModifiers, //Replace with new modifiers
+            this.fieldNode.name,
+            this.fieldNode.questionToken,
+            this.fieldNode.type,
+            this.fieldNode.initializer,
+        );
+        return [updatedProperty,changes];
+    }
+
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
+        // Capture the existing isArray decorator options
+        const validationOptions: ts.ObjectLiteralElementLike[] = this.existingValidationOptions(existingDecorator);
+
+        // Re-create the isArray decorator with the existing isArray decorator options
+        const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
+        const argumentsArray: ts.Expression[] = this.createDecoratorArguments(validationOptions);
+        const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return ts.factory.createDecorator(call)
+    }
+
+    private createDecoratorArguments(validationOptions: ts.ObjectLiteralElementLike[]) {
+        const argumentsArray: ts.Expression[] = [];
+        if (validationOptions.length > 0) {
+            const validationOptionsObjectLiteral = ts.factory.createObjectLiteralExpression(validationOptions);
+            argumentsArray.push(validationOptionsObjectLiteral);
+        }
+        return argumentsArray;
+    }
+
+    private existingValidationOptions(existingDecorator: ts.Decorator | undefined) {
+        const validationOptions: ts.ObjectLiteralElementLike[] = [];
+
+        if (existingDecorator !== undefined) {
+            //Pre-set the isArray options from the existing IsArray decorator
+            const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+            // Check if  call expression has at least 1 argument
+            if (existingCallExpression.arguments.length > 0) {
+                if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[0])) { throw new Error('IsArray decorator 1st argument must be an object literal containing the validation options'); }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0] as ts.ObjectLiteralExpression;
+                validationOptions.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        return validationOptions;
+    }
+
+    private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+
+    private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+
+    private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+    }
+
+    private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+        const callExpression = m.expression as ts.CallExpression;
+        const identifier = callExpression.expression as ts.Identifier;
+        return identifier.text === identifierName;
+    }
+
+}

package/src/code-builder/lib/field/decorator-managers/dto/BigIntDecoratorManager.d.ts

@@ -0,0 +1,24 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { Change } from "@schematics/angular/utility/change";
+export interface BigIntDecoratorOptions {
+    isBigInt: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class BigIntDecoratorManager implements DecoratorManager {
+    options: BigIntDecoratorOptions;
+    fieldNode?: any;
+    constructor(options: BigIntDecoratorOptions, fieldNode?: any);
+    isApplyDecorator(): boolean;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    decoratorName(): string;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}

package/src/code-builder/lib/field/decorator-managers/dto/BigIntDecoratorManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BigIntDecoratorManager.js","sourceRoot":"","sources":["BigIntDecoratorManager.ts"],"names":[],"mappings":"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"}

package/src/code-builder/lib/field/decorator-managers/dto/BigIntDecoratorManager.ts

@@ -0,0 +1,121 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+export interface BigIntDecoratorOptions {
+  isBigInt: boolean;
+  source: ts.SourceFile;
+  field: any;
+}
+export class BigIntDecoratorManager implements DecoratorManager {
+  constructor(public options: BigIntDecoratorOptions, public fieldNode?: any) { }
+  isApplyDecorator(): boolean {
+    return this.options.isBigInt;
+  }
+  buildDecorator(): PartialAddFieldChange {
+    const fieldSourceLines = [];
+    const changes: Change[] = [];
+    fieldSourceLines.push(`@${this.decoratorName()}()`);
+    changes.push(...this.decoratorImports());
+    return {
+      filePath: this.options.source.fileName,
+      field: this.options.field,
+      changes: changes,
+      fieldSourceLines: fieldSourceLines,
+    };
+  }
+
+  setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+    this.fieldNode = fieldNode;
+  }
+
+  decoratorName(): string {
+    return 'IsBigInt';
+  }
+
+  decoratorImports(): Change[] {
+    return [insertImport(
+        this.options.source,
+        this.options.source.fileName,
+        this.decoratorName(),
+        '../../FieldManager')]
+}
+
+  updateDecorator(): [PropertyDeclaration, Change[]] {
+    if (!this.fieldNode) throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+
+    let newModifiers: ModifierLike[] = [];
+    let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.fieldNode.modifiers;
+
+    // Check if the field has an Length decorator.
+    //@ts-ignore
+    const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+
+    //Remove the column decorator if the column decorator exists
+    //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+    newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+    //Add the column decorator if column decorator is required  
+    const changes: Change[] = [];  
+    if (this.isApplyDecorator()) {
+      newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+      changes.push(...this.decoratorImports());
+    }
+
+    const updatedProperty = ts.factory.updatePropertyDeclaration(
+      this.fieldNode,
+      newModifiers, //Replace with new modifiers
+      this.fieldNode.name,
+      this.fieldNode.questionToken,
+      this.fieldNode.type,
+      this.fieldNode.initializer,
+    );
+    return [updatedProperty,changes];
+  }
+
+  createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
+    // Capture the existing column decorator options
+    const validationOptions: ts.ObjectLiteralElementLike[] = [];
+
+    if (existingDecorator !== undefined) {
+      // Pre-set the column options from the existing column decorator
+      const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+      // Check if  call expression has at least 1 arguments
+      if (existingCallExpression.arguments.length > 0) {
+        if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[0])) { throw new Error(`${this.decoratorName()} decorator 1rd argument must be an object literal containing the validation options`); }
+        const existingObjectLiteralExpression = existingCallExpression.arguments[0] as ts.ObjectLiteralExpression;
+        validationOptions.push(...existingObjectLiteralExpression.properties);
+      }
+    }
+
+    // Re-create the column decorator with the merged column decorator options
+    const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
+    const argumentsArray: ts.Expression[] = [];
+    if (validationOptions.length > 0) {
+      const validationOptionsObjectLiteral = ts.factory.createObjectLiteralExpression(validationOptions);
+      argumentsArray.push(validationOptionsObjectLiteral);
+    }
+    const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+    return ts.factory.createDecorator(call)
+  }
+
+  private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+  }
+
+  private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+  }
+
+  private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+  }
+
+  private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+    const callExpression = m.expression as ts.CallExpression;
+    const identifier = callExpression.expression as ts.Identifier;
+    return identifier.text === identifierName;
+  }
+
+}

package/src/code-builder/lib/field/decorator-managers/dto/BooleanDecoratorManager.d.ts

@@ -0,0 +1,24 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { Change } from "@schematics/angular/utility/change";
+export interface BooleanDecoratorOptions {
+    isBoolean: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class BooleanDecoratorManager implements DecoratorManager {
+    options: BooleanDecoratorOptions;
+    fieldNode?: any;
+    constructor(options: BooleanDecoratorOptions, fieldNode?: any);
+    isApplyDecorator(): boolean;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    decoratorName(): string;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}

package/src/code-builder/lib/field/decorator-managers/dto/BooleanDecoratorManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BooleanDecoratorManager.js","sourceRoot":"","sources":["BooleanDecoratorManager.ts"],"names":[],"mappings":"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"}

package/src/code-builder/lib/field/decorator-managers/dto/BooleanDecoratorManager.ts

@@ -0,0 +1,125 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+export interface BooleanDecoratorOptions {
+  isBoolean: boolean;
+  source: ts.SourceFile;
+  field: any;
+}
+export class BooleanDecoratorManager implements DecoratorManager { //FIXME : This decorator needs to be replaced with the isBoolean decorator
+  constructor(public options: BooleanDecoratorOptions, public fieldNode?: any) { }
+  isApplyDecorator(): boolean {
+    return this.options.isBoolean;
+  }
+  buildDecorator(): PartialAddFieldChange {
+    const fieldSourceLines = [];
+    const changes: Change[] = [];
+    fieldSourceLines.push(`@${this.decoratorName()}()`);
+    changes.push(...this.decoratorImports());
+    return {
+      filePath: this.options.source.fileName,
+      field: this.options.field,
+      changes: changes,
+      fieldSourceLines: fieldSourceLines,
+    };
+  }
+
+  setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+    this.fieldNode = fieldNode;
+  }
+
+  decoratorName(): string {
+    return 'IsBoolean';
+  }
+
+  decoratorImports(): Change[] {
+    return [
+      insertImport(
+        this.options.source,
+        this.options.source.fileName,
+        this.decoratorName(),
+        'class-validator',
+      ),
+    ];
+  }
+
+  updateDecorator(): [PropertyDeclaration, Change[]] {
+    if (!this.fieldNode) throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+
+    let newModifiers: ModifierLike[] = [];
+    let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.fieldNode.modifiers;
+
+    // Check if the field has an Length decorator.
+    //@ts-ignore
+    const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+
+    //Remove the column decorator if the column decorator exists
+    //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+    newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+    //Add the column decorator if column decorator is required  
+    const changes: Change[] = [];  
+    if (this.isApplyDecorator()) {
+      newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+      changes.push(...this.decoratorImports());
+    }
+
+    const updatedProperty = ts.factory.updatePropertyDeclaration(
+      this.fieldNode,
+      newModifiers, //Replace with new modifiers
+      this.fieldNode.name,
+      this.fieldNode.questionToken,
+      this.fieldNode.type,
+      this.fieldNode.initializer,
+    );
+    return [updatedProperty,changes];
+
+  }
+
+  createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
+    // Capture the existing column decorator options
+    const validationOptions: ts.ObjectLiteralElementLike[] = [];
+
+    if (existingDecorator !== undefined) {
+      //Pre-set the column options from the existing column decorator
+      const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+      // Check if  call expression has at least 1 arguments
+      if (existingCallExpression.arguments.length > 0) {
+        if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[0])) { throw new Error('Boolean decorator 1st argument must be an object literal containing the validation options'); }
+        const existingObjectLiteralExpression = existingCallExpression.arguments[0] as ts.ObjectLiteralExpression;
+        validationOptions.push(...existingObjectLiteralExpression.properties);
+      }
+    }
+
+    // Re-create the column decorator with the merged column decorator options
+    const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
+    const argumentsArray: ts.Expression[] = [];
+    if (validationOptions.length > 0) {
+      const validationOptionsObjectLiteral = ts.factory.createObjectLiteralExpression(validationOptions);
+      argumentsArray.push(validationOptionsObjectLiteral);
+    }
+    const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+    return ts.factory.createDecorator(call)
+  }
+
+  private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+  }
+
+  private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+  }
+
+  private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+  }
+
+  private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+    const callExpression = m.expression as ts.CallExpression;
+    const identifier = callExpression.expression as ts.Identifier;
+    return identifier.text === identifierName;
+  }
+
+}

package/src/code-builder/lib/field/decorator-managers/dto/DateDecoratorManager.d.ts

@@ -0,0 +1,24 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { Change } from "@schematics/angular/utility/change";
+export interface DateDecoratorOptions {
+    isDate: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class DateDecoratorManager implements DecoratorManager {
+    options: DateDecoratorOptions;
+    fieldNode?: any;
+    constructor(options: DateDecoratorOptions, fieldNode?: any);
+    isApplyDecorator(): boolean;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    decoratorName(): string;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}

package/src/code-builder/lib/field/decorator-managers/dto/DateDecoratorManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DateDecoratorManager.js","sourceRoot":"","sources":["DateDecoratorManager.ts"],"names":[],"mappings":"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"}

package/src/code-builder/lib/field/decorator-managers/dto/DateDecoratorManager.ts

@@ -0,0 +1,130 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+export interface DateDecoratorOptions {
+  isDate: boolean;
+  source: ts.SourceFile;
+  field: any;
+}
+export class DateDecoratorManager implements DecoratorManager { //FIXME : This decorator needs to be replaced with the IsDate decorator
+  constructor(public options: DateDecoratorOptions, public fieldNode?: any) { }
+  isApplyDecorator(): boolean {
+    return this.options.isDate;
+  }
+  buildDecorator(): PartialAddFieldChange {
+    const fieldSourceLines = [];
+    const changes: Change[] = [];
+    // fieldSourceLines.push(`@Type(() => Date)`);
+    fieldSourceLines.push(`@${this.decoratorName()}()`);
+    changes.push(...this.decoratorImports())
+    return {
+      filePath: this.options.source.fileName,
+      field: this.options.field,
+      changes: changes,
+      fieldSourceLines: fieldSourceLines,
+    };
+  }
+
+  setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+    this.fieldNode = fieldNode;
+  }
+
+  decoratorName(): string {
+    return 'IsDate';
+  }
+
+  decoratorImports(): Change[] {
+    return [
+      insertImport(
+        this.options.source,
+        this.options.source.fileName,
+        this.decoratorName(),
+        'class-validator',
+      ),
+    ];
+  }
+
+  updateDecorator(): [PropertyDeclaration, Change[]] {
+    if (!this.fieldNode) throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+
+    let newModifiers: ModifierLike[] = [];
+    let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.fieldNode.modifiers;
+
+    // Check if the field has an Length decorator.
+    //@ts-ignore
+    const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+
+    //Remove the column decorator if the column decorator exists
+    //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+    newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+    //Add the column decorator if column decorator is required  
+    const changes: Change[] = [];  
+
+    if (this.isApplyDecorator()) {
+      newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+      changes.push(...this.decoratorImports());
+    }
+
+    const updatedProperty = ts.factory.updatePropertyDeclaration(
+      this.fieldNode,
+      newModifiers, //Replace with new modifiers
+      this.fieldNode.name,
+      this.fieldNode.questionToken,
+      this.fieldNode.type,
+      this.fieldNode.initializer,
+    );
+    return [updatedProperty, changes];
+  }
+
+  createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
+    // Capture the existing column decorator options
+    const validationOptions: ts.ObjectLiteralElementLike[] = [];
+
+    if (existingDecorator !== undefined) {
+      //Pre-set the column options from the existing column decorator
+      const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+      // Check if  call expression has at least 1 arguments
+      if (existingCallExpression.arguments.length > 0) {
+        if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[0])) { throw new Error('Date decorator 1st argument must be an object literal containing the validation options'); }
+        const existingObjectLiteralExpression = existingCallExpression.arguments[0] as ts.ObjectLiteralExpression;
+        validationOptions.push(...existingObjectLiteralExpression.properties);
+      }
+    }
+
+    // Re-create the column decorator with the merged column decorator options
+    const decoratorIdentifier = ts.factory.createIdentifier("IsDate");
+    const argumentsArray: ts.Expression[] = [];
+    if (validationOptions.length > 0) {
+      const validationOptionsObjectLiteral = ts.factory.createObjectLiteralExpression(validationOptions);
+      argumentsArray.push(validationOptionsObjectLiteral);
+    }
+    const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+    return ts.factory.createDecorator(call)
+  }
+
+  private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+  }
+
+  private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+  }
+
+//   private filterNonTransformerDecorators(existingDecorators: ts.Decorator[]): ts.Decorator[] {
+//     return existingDecorators ? existingDecorators.filter(m => !this.containsIdentifierName(m, 'Type')) : [];
+//   }
+
+  private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+  }
+
+  private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+    const callExpression = m.expression as ts.CallExpression;
+    const identifier = callExpression.expression as ts.Identifier;
+    return identifier.text === identifierName;
+  }
+
+}

package/src/code-builder/lib/field/decorator-managers/dto/DecimalDecoratorManager.d.ts

@@ -0,0 +1,24 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { Change } from "@schematics/angular/utility/change";
+export interface DecimalDecoratorOptions {
+    isDecimal: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class DecimalDecoratorManager implements DecoratorManager {
+    options: DecimalDecoratorOptions;
+    fieldNode?: any;
+    constructor(options: DecimalDecoratorOptions, fieldNode?: any);
+    isApplyDecorator(): boolean;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    decoratorName(): string;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}

package/src/code-builder/lib/field/decorator-managers/dto/DecimalDecoratorManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DecimalDecoratorManager.js","sourceRoot":"","sources":["DecimalDecoratorManager.ts"],"names":[],"mappings":"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"}