@solidstarters/solid-code-builder 1.0.20 → 1.0.22

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

@@ -1,100 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredDecoratorManager = 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 RequiredDecoratorManager {
-    constructor(options, fieldNode) {
-        this.options = options;
-        this.fieldNode = fieldNode;
-    }
-    isApplyDecorator() {
-        return this.options.isApplyRequired && this.options.required;
-    }
-    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 'IsNotEmpty';
-    }
-    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.
-        //@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 = [];
-        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('IsNotEmpty 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.RequiredDecoratorManager = RequiredDecoratorManager;
-//# sourceMappingURL=RequiredDecoratorManager.js.map

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

@@ -1,99 +0,0 @@
-"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/src/code-builder/lib/field/decorator-managers/dto/TransformDecoratorManager.js

@@ -1,102 +0,0 @@
-"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/src/code-builder/lib/field/decorator-managers/dto/ValidateNestedDecoratorManager.js

@@ -1,140 +0,0 @@
-"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/src/code-builder/lib/field/decorator-managers/entity/ColumnDecoratorManager.js

@@ -1,178 +0,0 @@
-"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