@solidstarters/solid-code-builder 1.0.0

package/dist/code-builder/lib/field/decorator-managers/dto/StringDecoratorManager.js

@@ -0,0 +1,99 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StringDecoratorManager = void 0;
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class StringDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isString;
+    }
+    buildDecorator() {
+        const fieldSourceLines = [];
+        const changes = [];
+        fieldSourceLines.push(`@${this.decoratorName()}()`);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    decoratorName() {
+        return 'IsString';
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'class-validator')];
+    }
+    updateDecorator() {
+        if (!this.fieldNode)
+            throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if the field has an Length decorator.
+        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 = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+        const updatedProperty = typescript_1.default.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) {
+        // Capture the existing column decorator options
+        let validationOptions = [];
+        if (existingDecorator !== undefined) {
+            //Pre-set the column options from the existing column decorator
+            const existingCallExpression = existingDecorator.expression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 0) {
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[0])) {
+                    throw new Error(`${this.decoratorName()} decorator 1st argument must be an object literal containing the validation options`);
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0];
+                validationOptions.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        // Re-create the column decorator with the merged column decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const argumentsArray = [];
+        if (validationOptions.length > 0) {
+            const validationOptionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(validationOptions);
+            argumentsArray.push(validationOptionsObjectLiteral);
+        }
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    findDecorator(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+    filterOtherDecorators(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+    filterNonDecorators(existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== typescript_1.default.SyntaxKind.Decorator)).map(m => m) : [];
+    }
+    containsIdentifierName(m, identifierName) {
+        const callExpression = m.expression;
+        const identifier = callExpression.expression;
+        return identifier.text === identifierName;
+    }
+}
+exports.StringDecoratorManager = StringDecoratorManager;
+//# sourceMappingURL=StringDecoratorManager.js.map

package/dist/code-builder/lib/field/decorator-managers/dto/StringDecoratorManager.js.map

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

package/dist/code-builder/lib/field/decorator-managers/dto/TransformDecoratorManager.d.ts

@@ -0,0 +1,25 @@
+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 TransformDecoratorOptions {
+    isTransform: boolean;
+    type: string;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class TransformDecoratorManager implements DecoratorManager {
+    options: TransformDecoratorOptions;
+    fieldNode?: any | undefined;
+    constructor(options: TransformDecoratorOptions, fieldNode?: any | undefined);
+    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/dist/code-builder/lib/field/decorator-managers/dto/TransformDecoratorManager.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransformDecoratorManager = void 0;
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class TransformDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isTransform;
+    }
+    buildDecorator() {
+        const fieldSourceLines = [];
+        const changes = [];
+        fieldSourceLines.push(`@${this.decoratorName()}(() => ${this.options.type})`);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    decoratorName() {
+        return 'Type';
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'class-transformer')];
+    }
+    updateDecorator() {
+        if (!this.fieldNode)
+            throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if the field has an Transform decorator.
+        //@ts-ignore
+        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 = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+        const updatedProperty = typescript_1.default.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) {
+        // Capture the existing column decorator options
+        const validationOptions = [];
+        if (existingDecorator !== undefined) {
+            //Pre-set the column options from the existing column decorator
+            const existingCallExpression = existingDecorator.expression;
+            // Check if  call expression has at least 2 arguments
+            if (existingCallExpression.arguments.length > 1) {
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[1])) {
+                    throw new Error('Transform decorator 1st argument must be an object literal containing the validation options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[1];
+                validationOptions.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        // Re-create the column decorator with the merged column decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const argumentsArray = [];
+        const transformFunction = typescript_1.default.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createIdentifier(this.options.type));
+        argumentsArray.push(transformFunction);
+        if (validationOptions.length > 0) {
+            const validationOptionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(validationOptions);
+            argumentsArray.push(validationOptionsObjectLiteral);
+        }
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    findDecorator(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+    filterOtherDecorators(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+    filterNonDecorators(existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== typescript_1.default.SyntaxKind.Decorator)).map(m => m) : [];
+    }
+    containsIdentifierName(m, identifierName) {
+        const callExpression = m.expression;
+        const identifier = callExpression.expression;
+        return identifier.text === identifierName;
+    }
+}
+exports.TransformDecoratorManager = TransformDecoratorManager;
+//# sourceMappingURL=TransformDecoratorManager.js.map

package/dist/code-builder/lib/field/decorator-managers/dto/TransformDecoratorManager.js.map

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

package/dist/code-builder/lib/field/decorator-managers/dto/ValidateNestedDecoratorManager.d.ts

@@ -0,0 +1,30 @@
+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 ValidateNestedDecoratorOptions {
+    isValidateNested: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class ValidateNestedDecoratorManager implements DecoratorManager {
+    options: ValidateNestedDecoratorOptions;
+    fieldNode?: ts.PropertyDeclaration | undefined;
+    constructor(options: ValidateNestedDecoratorOptions, fieldNode?: ts.PropertyDeclaration | undefined);
+    isApplyDecorator(): boolean;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    decoratorName(): string;
+    decoratorImports(): Change[];
+    private buildValidationOptionsCode;
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator;
+    private mergeExistingAndNewValidationOptions;
+    private createValidationDecoratorOptions;
+    private optionsToPropertyAssignmentsOrNull;
+    private createDecoratorArguments;
+    private existingValidationOptions;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}

package/dist/code-builder/lib/field/decorator-managers/dto/ValidateNestedDecoratorManager.js

@@ -0,0 +1,140 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidateNestedDecoratorManager = void 0;
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class ValidateNestedDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isValidateNested;
+    }
+    buildDecorator() {
+        const fieldSourceLines = [];
+        const changes = [];
+        fieldSourceLines.push(`@${this.decoratorName()}(${this.buildValidationOptionsCode()})`);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    decoratorName() {
+        return 'ValidateNested';
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'class-validator')];
+    }
+    buildValidationOptionsCode() {
+        return `{ each : true }`;
+    }
+    updateDecorator() {
+        if (!this.fieldNode)
+            throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+        let newModifiers = [];
+        let existingModifiers = 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 = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+        const updatedProperty = typescript_1.default.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) {
+        // Capture the existing isArray decorator options
+        const validationOptions = this.existingValidationOptions(existingDecorator);
+        //Merge the options with the existing options
+        const mergedValidationOptions = this.mergeExistingAndNewValidationOptions(validationOptions);
+        // Re-create the isArray decorator with the existing isArray decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const argumentsArray = this.createDecoratorArguments(mergedValidationOptions);
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    mergeExistingAndNewValidationOptions(validationOptions) {
+        const decoratorOptions = this.createValidationDecoratorOptions();
+        const mergedValidationOptions = Array.from(decoratorOptions.values()).filter(p => p !== null);
+        // console.log('mergedValidationOptions', mergedValidationOptions.map(p => JSON.stringify(p.name)).join(', '));
+        // Add the other unhandled column decorator options
+        const handledDecoratorOptions = Array.from(decoratorOptions.keys());
+        //@ts-ignore
+        const otherPropertyAssignments = validationOptions.filter(ps => { var _a; return !handledDecoratorOptions.includes((_a = ps.name) === null || _a === void 0 ? void 0 : _a.escapedText); });
+        mergedValidationOptions.push(...otherPropertyAssignments);
+        return mergedValidationOptions;
+    }
+    createValidationDecoratorOptions() {
+        const options = new Map();
+        options.set('each', typescript_1.default.factory.createTrue());
+        return this.optionsToPropertyAssignmentsOrNull(options);
+    }
+    optionsToPropertyAssignmentsOrNull(options) {
+        const decoratorOptions = new Map();
+        options.forEach((value, key) => {
+            if (value !== null) {
+                decoratorOptions.set(key, typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier(key), value));
+            }
+            else {
+                decoratorOptions.set(key, null);
+            }
+        });
+        return decoratorOptions;
+    }
+    createDecoratorArguments(validationOptions) {
+        const argumentsArray = [];
+        if (validationOptions.length > 0) {
+            const validationOptionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(validationOptions);
+            argumentsArray.push(validationOptionsObjectLiteral);
+        }
+        return argumentsArray;
+    }
+    existingValidationOptions(existingDecorator) {
+        const validationOptions = [];
+        if (existingDecorator !== undefined) {
+            //Pre-set the isArray options from the existing IsArray decorator
+            const existingCallExpression = existingDecorator.expression;
+            // Check if  call expression has at least 1 argument
+            if (existingCallExpression.arguments.length > 0) {
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[0])) {
+                    throw new Error('ValidateNested decorator 1st argument must be an object literal containing the validation options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0];
+                validationOptions.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        return validationOptions;
+    }
+    findDecorator(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+    filterOtherDecorators(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+    filterNonDecorators(existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== typescript_1.default.SyntaxKind.Decorator)).map(m => m) : [];
+    }
+    containsIdentifierName(m, identifierName) {
+        const callExpression = m.expression;
+        const identifier = callExpression.expression;
+        return identifier.text === identifierName;
+    }
+}
+exports.ValidateNestedDecoratorManager = ValidateNestedDecoratorManager;
+//# sourceMappingURL=ValidateNestedDecoratorManager.js.map

package/dist/code-builder/lib/field/decorator-managers/dto/ValidateNestedDecoratorManager.js.map

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

package/dist/code-builder/lib/field/decorator-managers/entity/ColumnDecoratorManager.d.ts

@@ -0,0 +1,34 @@
+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";
+interface ColumnDecoratorOptions {
+    isColumn: boolean;
+    columnName: string;
+    type: string;
+    required: boolean;
+    otherOptions: Map<string, any>;
+    otherOptionExpressions: Map<string, ts.Expression | null>;
+    source: ts.SourceFile;
+    field: any;
+}
+export declare class ColumnDecoratorManager implements DecoratorManager {
+    options: ColumnDecoratorOptions;
+    fieldNode?: PropertyDeclaration | undefined;
+    constructor(options: ColumnDecoratorOptions, fieldNode?: PropertyDeclaration | undefined);
+    isApplyDecorator(): boolean;
+    decoratorName(): string;
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void;
+    buildDecorator(): PartialAddFieldChange;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+    private createColumnDecorator;
+    private createColumnDecoratorOptions;
+    private optionsToPropertyAssignmentsOrNull;
+    private buildColumnDecoratorOptions;
+    private buildColumnOptionsCode;
+}
+export {};

package/dist/code-builder/lib/field/decorator-managers/entity/ColumnDecoratorManager.js

@@ -0,0 +1,178 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ColumnDecoratorManager = void 0;
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const lodash_1 = __importDefault(require("lodash"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class ColumnDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isColumn;
+    }
+    decoratorName() {
+        return 'Column';
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    buildDecorator() {
+        const fieldSourceLines = [];
+        const changes = [];
+        //Add the Column decorator to the field
+        const columnDecoratorLine = `@${this.decoratorName()}(${this.buildColumnOptionsCode()})`;
+        fieldSourceLines.push(columnDecoratorLine);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'typeorm')];
+    }
+    updateDecorator() {
+        if (!this.fieldNode)
+            throw new Error('Field node is required for updating the index decorator');
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if the field has an Column decorator.
+        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 = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createColumnDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+        const updatedProperty = typescript_1.default.factory.updatePropertyDeclaration(this.fieldNode, newModifiers, //Replace with new modifiers
+        this.fieldNode.name, this.fieldNode.questionToken, this.fieldNode.type, this.fieldNode.initializer);
+        return [updatedProperty, changes];
+    }
+    findDecorator(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+    filterOtherDecorators(name, existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === typescript_1.default.SyntaxKind.Decorator)).map(m => m).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+    filterNonDecorators(existingModifiers) {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== typescript_1.default.SyntaxKind.Decorator)).map(m => m) : [];
+    }
+    containsIdentifierName(m, identifierName) {
+        const callExpression = m.expression;
+        const identifier = callExpression.expression;
+        return identifier.text === identifierName;
+    }
+    createColumnDecorator(existingColumnDecorator) {
+        // Capture the existing column decorator options
+        let existingColumnDecoratorPropertyAssignments = [];
+        if (existingColumnDecorator !== undefined) {
+            //Pre-set the column options from the existing column decorator
+            const existingCallExpression = existingColumnDecorator.expression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 0) {
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[0])) {
+                    throw new Error('Column decorator 1st arguments must be an object literal containing the column options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0];
+                existingColumnDecoratorPropertyAssignments.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        // Create the new column decorator options as property assignments, if the option is not null
+        const columnDecoratorOptions = this.createColumnDecoratorOptions();
+        const newPropertyAssignments = Array.from(columnDecoratorOptions.values()).filter(p => p !== null);
+        // console.log('newPropertyAssignments', newPropertyAssignments.map(p => JSON.stringify(p.name)).join(', '));
+        // Add the other unhandled column decorator options
+        const handledColumnDecoratorOptions = Array.from(columnDecoratorOptions.keys());
+        //@ts-ignore
+        const otherPropertyAssignments = existingColumnDecoratorPropertyAssignments.filter(ps => { var _a; return !handledColumnDecoratorOptions.includes((_a = ps.name) === null || _a === void 0 ? void 0 : _a.escapedText); });
+        newPropertyAssignments.push(...otherPropertyAssignments);
+        // Re-create the column decorator with the merged column decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const decoratorOptions = typescript_1.default.factory.createObjectLiteralExpression(newPropertyAssignments);
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, [decoratorOptions]);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    createColumnDecoratorOptions() {
+        const options = new Map();
+        //Set common options
+        //TODO Proper types to be used e.g ColumnCommonOptions
+        // if (this.field.defaultValue) {
+        //   options.set('default',  this.field.defaultValue);
+        // }
+        (!lodash_1.default.isEmpty(this.options.columnName)) ? options.set('name', typescript_1.default.factory.createStringLiteral(this.options.columnName)) : options.set('name', null);
+        (this.options.type) ? options.set('type', typescript_1.default.factory.createStringLiteral(this.options.type)) : options.set('type', null);
+        if (!this.options.required) {
+            options.set('nullable', typescript_1.default.factory.createTrue());
+        }
+        //Set additional options
+        this.options.otherOptionExpressions.forEach((value, key) => {
+            options.set(key, value);
+        });
+        return this.optionsToPropertyAssignmentsOrNull(options);
+    }
+    optionsToPropertyAssignmentsOrNull(options) {
+        const decoratorOptions = new Map();
+        options.forEach((value, key) => {
+            if (value !== null) {
+                decoratorOptions.set(key, typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier(key), value));
+            }
+            else {
+                decoratorOptions.set(key, null);
+            }
+        });
+        return decoratorOptions;
+    }
+    buildColumnDecoratorOptions() {
+        const options = new Map();
+        //Set common options
+        //TODO Proper types to be used e.g ColumnCommonOptions
+        // if (this.options.field.defaultValue) {
+        //   options.set('default', this.options.field.defaultValue);
+        // }
+        if (!lodash_1.default.isEmpty(this.options.columnName)) {
+            options.set('name', `${this.options.columnName}`);
+        }
+        if (!lodash_1.default.isEmpty(this.options.type)) {
+            options.set('type', `${this.options.type}`);
+        }
+        if (!this.options.required) {
+            options.set('nullable', true);
+        }
+        // Set some keys as null, to indicate they are handled i.e they will be removed & recreated, if required
+        //Handled keys
+        // options.set('length', null) //TODO Can be improved, since handled keys needs to be managed in this decorator. Ideally it should be managed in the corresponding field
+        //Set additional options
+        this.options.otherOptions.forEach((value, key) => {
+            options.set(key, value);
+        });
+        return options;
+    }
+    buildColumnOptionsCode() {
+        const options = this.buildColumnDecoratorOptions();
+        const keys = Array.from(options.keys());
+        const optionsString = keys
+            .filter((key) => options.get(key) !== null)
+            .map((key) => {
+            if (typeof options.get(key) === 'string') {
+                return `${key}: "${options.get(key)}"`;
+            }
+            else {
+                return `${key}: ${options.get(key)}`;
+            }
+        })
+            .join(', ');
+        return `{ ${optionsString} }`;
+    }
+}
+exports.ColumnDecoratorManager = ColumnDecoratorManager;
+//# sourceMappingURL=ColumnDecoratorManager.js.map