@solidstarters/solid-code-builder 1.0.10 → 1.0.12

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

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

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

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

package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js

@@ -0,0 +1,118 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JoinTableDecoratorManager = 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 JoinTableDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isManyToManyRelationOwner;
+    }
+    decoratorName() {
+        return 'JoinTable';
+    }
+    buildDecorator() {
+        const changes = [];
+        const fieldSourceLines = [];
+        // Add the many-to-many import
+        // const decoratorImport = insertImport(
+        //     this.options.source,
+        //     this.options.source.fileName,
+        //     this.decoratorName(),
+        //     'typeorm',
+        // );
+        // if (decoratorImport) {
+        //     changes.push(decoratorImport);
+        // }
+        fieldSourceLines.push(`@${this.decoratorName()}()`);
+        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')];
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    updateDecorator() {
+        // Check if the field property declaration exists, if not throw an error
+        if (!this.fieldNode)
+            throw new Error('Field node is required for updating the one to many decorator');
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if field has an existing one-to-many relation decorator
+        const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+        //Remove the many-to-one decorator if it 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 one-to-many 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) {
+        let existingRelationOptions = this.existingDecoratorOptions(existingDecorator);
+        // const mergedRelationOptions: ObjectLiteralElementLike[] = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
+        // Re-create the decorator with the merged decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const argumentsArray = this.createDecoratorArguments(existingRelationOptions);
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    createDecoratorArguments(joinTableOptions) {
+        const argumentsArray = [];
+        if (joinTableOptions.length > 0) {
+            const validationOptionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(joinTableOptions);
+            argumentsArray.push(validationOptionsObjectLiteral);
+        }
+        return argumentsArray;
+    }
+    existingDecoratorOptions(existingDecorator) {
+        let existingDecoratorPropertyAssignments = [];
+        if (existingDecorator !== undefined) {
+            //Pre-set the relation options from the existing relation decorator
+            const existingCallExpression = existingDecorator.expression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 0) { //Because we are interested in the 1st argument, we check for length > 0
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[0])) {
+                    throw new Error('JoinTable decorator 1st argument must be an object literal containing the joinTable options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0];
+                existingDecoratorPropertyAssignments.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        return existingDecoratorPropertyAssignments;
+    }
+    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.JoinTableDecoratorManager = JoinTableDecoratorManager;
+//# sourceMappingURL=JoinTableDecoratorManager.js.map

package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js.map

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

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

@@ -0,0 +1,37 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { Change } from "@schematics/angular/utility/change";
+import { DecoratorManager, DeleteType, PartialAddFieldChange } from "../../FieldManager";
+interface ManyToManyDecoratorOptions {
+    isManyToMany: boolean;
+    relationModelName: string;
+    relationInverseFieldName: string;
+    relationCascade: DeleteType;
+    owner: boolean;
+    source: ts.SourceFile;
+    field: any;
+    fieldName: string;
+    modelName: string;
+}
+export declare class ManyToManyDecoratorManager implements DecoratorManager {
+    options: ManyToManyDecoratorOptions;
+    fieldNode?: ts.PropertyDeclaration | undefined;
+    constructor(options: ManyToManyDecoratorOptions, fieldNode?: ts.PropertyDeclaration | undefined);
+    isApplyDecorator(): boolean;
+    decoratorName(): string;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: PropertyDeclaration): void;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    private buildRelationOptionsCode;
+    private createRelationDecorator;
+    private mergeNewAndExistingDecoratorOptions;
+    private createDecoratorArguments;
+    private existingDecoratorOptions;
+    private createRelationDecoratorOptions;
+    private optionsToPropertyAssignmentsOrNull;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}
+export {};

package/src/code-builder/lib/field/decorator-managers/entity/ManyToManyDecoratorManager.js

@@ -0,0 +1,175 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToManyDecoratorManager = void 0;
+const strings_1 = require("@angular-devkit/core/src/utils/strings");
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class ManyToManyDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isManyToMany;
+    }
+    decoratorName() {
+        return 'ManyToMany';
+    }
+    buildDecorator() {
+        const changes = [];
+        const fieldSourceLines = [];
+        // Add the many-to-many import
+        // const decoratorImport = insertImport(
+        //     this.options.source,    
+        //     this.options.source.fileName,
+        //     this.decoratorName(),
+        //     'typeorm',
+        // );
+        changes.push(...this.decoratorImports());
+        // if (decoratorImport) {
+        //     changes.push(decoratorImport);
+        // }
+        const fieldSourceLineComponents = [];
+        fieldSourceLineComponents.push(`() => ${(0, strings_1.classify)(this.options.relationModelName)}`);
+        this.options.relationInverseFieldName ? fieldSourceLineComponents.push(`${(0, strings_1.camelize)(this.options.relationModelName)} => ${(0, strings_1.camelize)(this.options.relationModelName)}.${this.options.relationInverseFieldName}`) : "no-ops";
+        fieldSourceLineComponents.push(`${this.buildRelationOptionsCode()}`);
+        fieldSourceLines.push(`@${this.decoratorName()}(${fieldSourceLineComponents.join(', ')})`);
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'typeorm')];
+    }
+    updateDecorator() {
+        // Check if the field property declaration exists, if not throw an error
+        if (!this.fieldNode)
+            throw new Error('Field node is required for updating the one to many decorator');
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if field has an existing one-to-many relation decorator
+        const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+        //Remove the many-to-one decorator if it 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 one-to-many decorator if it is required  
+        const changes = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createRelationDecorator(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];
+    }
+    buildRelationOptionsCode() {
+        const relationOptions = new Map();
+        // this.options.owner ? relationOptions.set('cascade', true): "no-ops";
+        this.options.owner ? relationOptions.set('cascade', true) : relationOptions.set('cascade', ['insert', 'update']);
+        const decoratorArgs = Array.from(relationOptions)
+            .map(([key, value]) => {
+            if (Array.isArray(value)) {
+                return `${key}: [${value.map(v => `'${v}'`).join(', ')}]`;
+            }
+            return `${key}: ${value}`;
+        })
+            .join(', ');
+        // Convert the map to a string
+        return `{ ${decoratorArgs} }`;
+    }
+    createRelationDecorator(existingRelationDecorator) {
+        let existingRelationOptions = this.existingDecoratorOptions(existingRelationDecorator);
+        const mergedRelationOptions = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
+        // Re-create the decorator with the merged decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const argumentsArray = this.createDecoratorArguments(mergedRelationOptions);
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    mergeNewAndExistingDecoratorOptions(existingRelationOptions) {
+        const decoratorOptions = this.createRelationDecoratorOptions();
+        const newPropertyAssignments = Array.from(decoratorOptions.values()).filter(p => p !== null);
+        // console.log('newPropertyAssignments', newPropertyAssignments.map(p => JSON.stringify(p.name)).join(', '));
+        // Add the other unhandled column decorator options
+        const handledDecoratorOptions = Array.from(decoratorOptions.keys());
+        //@ts-ignore
+        const otherPropertyAssignments = existingRelationOptions.filter(ps => { var _a; return !handledDecoratorOptions.includes((_a = ps.name) === null || _a === void 0 ? void 0 : _a.escapedText); });
+        newPropertyAssignments.push(...otherPropertyAssignments);
+        return newPropertyAssignments;
+    }
+    createDecoratorArguments(newPropertyAssignments) {
+        const argumentsArray = [];
+        // 1st Argument: Target
+        const typeFunctionOrTarget = typescript_1.default.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createIdentifier((0, strings_1.classify)(this.options.relationModelName)));
+        argumentsArray.push(typeFunctionOrTarget);
+        if (this.options.relationInverseFieldName) {
+            // 2nd Argument: Inverse side
+            const inverseSide = typescript_1.default.factory.createArrowFunction(undefined, undefined, [typescript_1.default.factory.createParameterDeclaration(undefined, undefined, typescript_1.default.factory.createIdentifier((0, strings_1.camelize)(this.options.relationModelName)), undefined, undefined, undefined)], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier((0, strings_1.camelize)(this.options.relationModelName)), typescript_1.default.factory.createIdentifier(this.options.relationInverseFieldName)));
+            argumentsArray.push(inverseSide);
+        }
+        // 3rd Argument: Options. This argument is optional
+        if (newPropertyAssignments.length > 0) {
+            const decoratorOptions = typescript_1.default.factory.createObjectLiteralExpression(newPropertyAssignments);
+            argumentsArray.push(decoratorOptions);
+        }
+        return argumentsArray;
+    }
+    existingDecoratorOptions(existingRelationDecorator) {
+        let existingRelationDecoratorPropertyAssignments = [];
+        if (existingRelationDecorator !== undefined) {
+            //Pre-set the relation options from the existing relation decorator
+            const existingCallExpression = existingRelationDecorator.expression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 2) { //Because we are interested in the 2nd argument, we check for length > 1
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[2])) {
+                    throw new Error('Many-to-Many decorator 3rd argument must be an object literal containing the relation options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[2];
+                existingRelationDecoratorPropertyAssignments.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        return existingRelationDecoratorPropertyAssignments;
+    }
+    createRelationDecoratorOptions() {
+        const relationOptions = new Map();
+        this.options.owner ? relationOptions.set('cascade', typescript_1.default.factory.createTrue()) : "no-ops";
+        return this.optionsToPropertyAssignmentsOrNull(relationOptions);
+    }
+    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;
+    }
+    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.ManyToManyDecoratorManager = ManyToManyDecoratorManager;
+//# sourceMappingURL=ManyToManyDecoratorManager.js.map

package/src/code-builder/lib/field/decorator-managers/entity/ManyToManyDecoratorManager.js.map

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

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

@@ -0,0 +1,34 @@
+import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { Change } from "@schematics/angular/utility/change";
+import { DecoratorManager, DeleteType, PartialAddFieldChange } from "../../FieldManager";
+interface ManyToOneDecoratorOptions {
+    isManyToOne: boolean;
+    relationModelSingularName: string;
+    relationCascade: DeleteType;
+    required: boolean;
+    source: ts.SourceFile;
+    field: any;
+    fieldName: string;
+    modelName: string;
+}
+export declare class ManyToOneDecoratorManager implements DecoratorManager {
+    options: ManyToOneDecoratorOptions;
+    fieldNode?: ts.PropertyDeclaration | undefined;
+    constructor(options: ManyToOneDecoratorOptions, fieldNode?: ts.PropertyDeclaration | undefined);
+    isApplyDecorator(): boolean;
+    decoratorName(): string;
+    buildDecorator(): PartialAddFieldChange;
+    setFieldNode(fieldNode: PropertyDeclaration): void;
+    decoratorImports(): Change[];
+    updateDecorator(): [PropertyDeclaration, Change[]];
+    private buildRelationOptionsCode;
+    private buildRelationDecoratorOptions;
+    private createRelationDecorator;
+    private createRelationDecoratorOptions;
+    private optionsToPropertyAssignmentsOrNull;
+    private findDecorator;
+    private filterOtherDecorators;
+    private filterNonDecorators;
+    private containsIdentifierName;
+}
+export {};

package/src/code-builder/lib/field/decorator-managers/entity/ManyToOneDecoratorManager.js

@@ -0,0 +1,179 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManyToOneDecoratorManager = void 0;
+const strings_1 = require("@angular-devkit/core/src/utils/strings");
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const lodash_1 = __importDefault(require("lodash"));
+class ManyToOneDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.isManyToOne;
+    }
+    decoratorName() {
+        return 'ManyToOne';
+    }
+    buildDecorator() {
+        const changes = [];
+        const fieldSourceLines = [];
+        // Add the ManyToOne import
+        // const relationImports = insertImport(
+        //     this.options.source,
+        //     this.options.source.fileName,
+        //     this.decoratorName(),
+        //     'typeorm',
+        // );
+        // if (relationImports) {
+        //     changes.push(relationImports);
+        // }
+        // Add the relation decorator
+        fieldSourceLines.push(`@${this.decoratorName()}(() => ${(0, strings_1.classify)(this.options.relationModelSingularName)}, ${this.buildRelationOptionsCode()})`);
+        changes.push(...this.decoratorImports());
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    decoratorImports() {
+        return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'typeorm')];
+    }
+    updateDecorator() {
+        // Check if the field property declaration exists, if not throw an error
+        if (!this.fieldNode)
+            throw new Error('Field node is required for updating the index decorator');
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        // Check if field has an existing many-to-one relation decorator
+        const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+        //Remove the many-to-one decorator if it 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 many-to-one decorator if it is required  
+        const changes = [];
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createRelationDecorator(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];
+    }
+    buildRelationOptionsCode() {
+        const options = this.buildRelationDecoratorOptions();
+        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} }`;
+    }
+    buildRelationDecoratorOptions() {
+        const options = new Map();
+        //Set common options
+        // onDelete option
+        if (!lodash_1.default.isEmpty(this.options.relationCascade)) {
+            const cascade = this.options.relationCascade.toUpperCase();
+            const onDeleteType = cascade;
+            options.set('onDelete', onDeleteType);
+        }
+        // nullable option
+        if (!this.options.required) {
+            options.set('nullable', true);
+        }
+        else {
+            options.set('nullable', false);
+        }
+        return options;
+    }
+    createRelationDecorator(existingRelationDecorator) {
+        // console.log('createRelationDecorator called with ....', existingRelationDecorator?.getText());
+        // Capture the existing relation decorator options
+        let existingRelationDecoratorPropertyAssignments = [];
+        if (existingRelationDecorator !== undefined) {
+            //Pre-set the relation options from the existing relation decorator
+            const existingCallExpression = existingRelationDecorator.expression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 1) { //Because we are interested in the 2nd argument, we check for length > 1
+                if (!typescript_1.default.isObjectLiteralExpression(existingCallExpression.arguments[1])) {
+                    throw new Error('ManyToOne decorator 2nd arguments must be an object literal containing the relation options');
+                }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[1];
+                existingRelationDecoratorPropertyAssignments.push(...existingObjectLiteralExpression.properties);
+            }
+        }
+        // Create the new relation decorator options
+        const decoratorOptions = this.createRelationDecoratorOptions();
+        const newPropertyAssignments = Array.from(decoratorOptions.values()).filter(p => p !== null);
+        // console.log('newPropertyAssignments', newPropertyAssignments.map(p => JSON.stringify(p.name)).join(', '));
+        // Add the other unhandled column decorator options
+        const handledDecoratorOptions = Array.from(decoratorOptions.keys());
+        //@ts-ignore
+        const otherPropertyAssignments = existingRelationDecoratorPropertyAssignments.filter(ps => { var _a; return !handledDecoratorOptions.includes((_a = ps.name) === null || _a === void 0 ? void 0 : _a.escapedText); });
+        newPropertyAssignments.push(...otherPropertyAssignments);
+        // Re-create the relation decorator with the merged relation decorator options
+        const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
+        const typeFunctionOrTarget = typescript_1.default.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EqualsGreaterThanToken), typescript_1.default.factory.createIdentifier((0, strings_1.classify)(this.options.relationModelSingularName)));
+        const decoratorOptionsExpression = typescript_1.default.factory.createObjectLiteralExpression(newPropertyAssignments);
+        const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, [typeFunctionOrTarget, decoratorOptionsExpression]);
+        return typescript_1.default.factory.createDecorator(call);
+    }
+    createRelationDecoratorOptions() {
+        const options = new Map();
+        const cascade = this.options.relationCascade.toUpperCase();
+        const onDeleteType = cascade;
+        options.set('onDelete', typescript_1.default.factory.createStringLiteral(onDeleteType));
+        if (!this.options.required) {
+            options.set('nullable', typescript_1.default.factory.createTrue());
+        }
+        else {
+            options.set('nullable', typescript_1.default.factory.createFalse());
+        }
+        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;
+    }
+    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.ManyToOneDecoratorManager = ManyToOneDecoratorManager;
+//# sourceMappingURL=ManyToOneDecoratorManager.js.map

package/src/code-builder/lib/field/decorator-managers/entity/ManyToOneDecoratorManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ManyToOneDecoratorManager.js","sourceRoot":"","sources":["ManyToOneDecoratorManager.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAkE;AAClE,gIAAiK;AACjK,qEAAqE;AAGrE,oDAAuB;AAWvB,MAAa,yBAAyB;IAClC,YAAmB,OAAkC,EAAS,SAA+B;QAA1E,YAAO,GAAP,OAAO,CAA2B;QAAS,cAAS,GAAT,SAAS,CAAsB;IAAK,CAAC;IACnG,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACpC,CAAC;IACD,aAAa;QACT,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,cAAc;QACV,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,2BAA2B;QAC3B,wCAAwC;QACxC,2BAA2B;QAC3B,oCAAoC;QACpC,4BAA4B;QAC5B,iBAAiB;QACjB,KAAK;QACL,yBAAyB;QACzB,qCAAqC;QACrC,IAAI;QACJ,6BAA6B;QAC7B,gBAAgB,CAAC,IAAI,CACjB,IAAI,IAAI,CAAC,aAAa,EAAE,UAAU,IAAA,kBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,KAAK,IAAI,CAAC,wBAAwB,EAAE,GAAG,CAC5H,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzC,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ;YACtC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,OAAO,EAAE,OAAO;YAChB,gBAAgB,EAAE,gBAAgB;SACrC,CAAC;IACN,CAAC;IACD,YAAY,CAAC,SAA8B;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,gBAAgB;QACZ,OAAO,CAAC,IAAA,wBAAY,EAChB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAC5B,IAAI,CAAC,aAAa,EAAE,EACpB,SAAS,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,eAAe;QACX,wEAAwE;QACxE,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAChG,IAAI,YAAY,GAAmB,EAAE,CAAC;QACtC,IAAI,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;QACjD,gEAAgE;QAChE,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACtF,+CAA+C;QAC/C,mHAAmH;QACnH,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACxI,mDAAmD;QACnD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE;YACzB,YAAY,GAAG,CAAC,GAAG,YAAY,EAAE,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAClF,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;SAC5C;QACD,MAAM,eAAe,GAAG,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CACxD,IAAI,CAAC,SAAS,EACd,YAAY,EAAE,4BAA4B;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,aAAa,EAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,WAAW,CAC7B,CAAC;QACF,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IACO,wBAAwB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,IAAI;aACrB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;aAC1C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACT,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;gBACtC,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;aAC1C;iBAAM;gBACH,OAAO,GAAG,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;aACxC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,OAAO,KAAK,aAAa,IAAI,CAAC;IAClC,CAAC;IACO,6BAA6B;QACjC,MAAM,OAAO,GAAQ,IAAI,GAAG,EAAe,CAAC;QAC5C,oBAAoB;QACpB,kBAAkB;QAClB,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAe,OAAqB,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SACzC;QACD,kBAAkB;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SACjC;aACI;YACD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;SAClC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,uBAAuB,CAAC,yBAAmD;QAC/E,iGAAiG;QACjG,kDAAkD;QAClD,IAAI,4CAA4C,GAAkC,EAAE,CAAC;QACrF,IAAI,yBAAyB,KAAK,SAAS,EAAE;YACzC,mEAAmE;YACnE,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,UAA+B,CAAC;YACzF,qDAAqD;YACrD,IAAI,sBAAsB,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,wEAAwE;gBACvH,IAAI,CAAC,oBAAE,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;oBAAE,MAAM,IAAI,KAAK,CAAC,6FAA6F,CAAC,CAAC;iBAAE;gBAC3L,MAAM,+BAA+B,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAC;gBAC1G,4CAA4C,CAAC,IAAI,CAAC,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;aACpG;SACJ;QACD,4CAA4C;QAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAC/D,MAAM,sBAAsB,GAA+B,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAA4B,CAAC;QACpJ,6GAA6G;QAC7G,mDAAmD;QACnD,MAAM,uBAAuB,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,YAAY;QACZ,MAAM,wBAAwB,GAAG,4CAA4C,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,WAAC,OAAA,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAA,EAAE,CAAC,IAAI,0CAAE,WAAqB,CAAC,CAAA,EAAA,CAAC,CAAC;QAC9J,sBAAsB,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;QACzD,8EAA8E;QAC9E,MAAM,mBAAmB,GAAG,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC9E,MAAM,oBAAoB,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CACvD,SAAS,EACT,SAAS,EACT,EAAE,EACF,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAC5D,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAA,kBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAChF,CAAA;QACD,MAAM,0BAA0B,GAAG,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;QACpG,MAAM,IAAI,GAAG,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,SAAS,EAAE,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,CAAC,CAAC;QACjI,OAAO,oBAAE,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IACO,8BAA8B;QAClC,MAAM,OAAO,GAAQ,IAAI,GAAG,EAAyB,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAC3D,MAAM,YAAY,GAAe,OAAqB,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;SACpD;aACI;YACD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,CAAC,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IACO,kCAAkC,CAAC,OAA0C;QACjF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAwC,CAAC;QACzE,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC3B,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAE,CAAC,OAAO,CAAC,wBAAwB,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;aAC3G;iBACI;gBACD,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aACnC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IACO,aAAa,CAAC,IAAY,EAAE,iBAA4D;QAC5F,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACrM,CAAC;IACO,qBAAqB,CAAC,IAAY,EAAE,iBAA4D;QACpG,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzL,CAAC;IACO,mBAAmB,CAAC,iBAA4D;QACpF,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrI,CAAC;IACO,sBAAsB,CAAC,CAAe,EAAE,cAAsB;QAClE,MAAM,cAAc,GAAG,CAAC,CAAC,UAA+B,CAAC;QACzD,MAAM,UAAU,GAAG,cAAc,CAAC,UAA2B,CAAC;QAC9D,OAAO,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC;IAC9C,CAAC;CACJ;AApLD,8DAoLC"}