@solidstarters/solid-code-builder 1.0.0

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

@@ -0,0 +1,219 @@
+import ts, { ModifierLike, ObjectLiteralElementLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import _ from 'lodash';
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+//TODO : Need to support column default e.g if type is a date field, the ormType should be deduced automatically depending upon the db used
+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 class ColumnDecoratorManager implements DecoratorManager {
+
+    constructor(public options: ColumnDecoratorOptions, public fieldNode?: PropertyDeclaration,) { }
+    isApplyDecorator(): boolean {
+        return this.options.isColumn;
+    }
+    decoratorName(): string {
+        return 'Column';
+    }
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+        this.fieldNode = fieldNode;
+    }
+    buildDecorator(): PartialAddFieldChange {
+        const fieldSourceLines = [];
+        const changes: Change[] = [];
+
+        //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(): Change[] {
+        return [insertImport(
+            this.options.source,
+            this.options.source.fileName,
+            this.decoratorName(),
+            'typeorm')]
+    }
+
+    updateDecorator(): [PropertyDeclaration, Change[]] {
+        if (!this.fieldNode) throw new Error('Field node is required for updating the index decorator');
+
+        let newModifiers: ModifierLike[] = [];
+        let existingModifiers: ts.NodeArray<ModifierLike> | undefined = 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: Change[] = [];  
+
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createColumnDecorator(existingDecorator)];
+            changes.push(...this.decoratorImports());
+        }
+
+        const updatedProperty = ts.factory.updatePropertyDeclaration(
+            this.fieldNode,
+            newModifiers, //Replace with new modifiers
+            this.fieldNode.name,
+            this.fieldNode.questionToken,
+            this.fieldNode.type,
+            this.fieldNode.initializer,
+        );
+        return [updatedProperty, changes];
+    }
+
+    private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+    }
+
+    private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+
+    private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+    }
+
+    private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+        const callExpression = m.expression as ts.CallExpression;
+        const identifier = callExpression.expression as ts.Identifier;
+        return identifier.text === identifierName;
+    }
+
+    private createColumnDecorator(existingColumnDecorator: ts.Decorator | undefined): ts.Decorator {
+        // Capture the existing column decorator options
+        let existingColumnDecoratorPropertyAssignments: ts.ObjectLiteralElementLike[] = [];
+        if (existingColumnDecorator !== undefined) {
+            //Pre-set the column options from the existing column decorator
+            const existingCallExpression = existingColumnDecorator.expression as ts.CallExpression;
+            // Check if  call expression has at least 1 arguments
+            if (existingCallExpression.arguments.length > 0) {
+                if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[0])) { throw new Error('Column decorator 1st arguments must be an object literal containing the column options'); }
+                const existingObjectLiteralExpression = existingCallExpression.arguments[0] as ts.ObjectLiteralExpression;
+                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: ObjectLiteralElementLike[] = Array.from(columnDecoratorOptions.values()).filter(p => p !== null) as ts.PropertyAssignment[];
+        // 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 => !handledColumnDecoratorOptions.includes(ps.name?.escapedText as string));
+        newPropertyAssignments.push(...otherPropertyAssignments);
+
+        // Re-create the column decorator with the merged column decorator options
+        const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
+        const decoratorOptions = ts.factory.createObjectLiteralExpression(newPropertyAssignments);
+        const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, [decoratorOptions]);
+        return ts.factory.createDecorator(call)
+    }
+
+    private createColumnDecoratorOptions(): Map<string, ts.PropertyAssignment | null> { //This function is used while updating the field
+        const options = new Map<string, ts.Expression | null>();
+
+        //Set common options
+        //TODO Proper types to be used e.g ColumnCommonOptions
+        // if (this.field.defaultValue) {
+        //   options.set('default',  this.field.defaultValue);
+        // }
+        (!_.isEmpty(this.options.columnName)) ? options.set('name', ts.factory.createStringLiteral(this.options.columnName)) : options.set('name', null);
+        (this.options.type) ? options.set('type', ts.factory.createStringLiteral(this.options.type)) : options.set('type', null);
+        if (!this.options.required) {
+            options.set('nullable', ts.factory.createTrue());
+        }
+
+        //Set additional options
+        this.options.otherOptionExpressions.forEach((value, key) => {
+            options.set(key, value);
+        });
+
+        return this.optionsToPropertyAssignmentsOrNull(options);
+    }
+
+    private optionsToPropertyAssignmentsOrNull(options: Map<string, ts.Expression | null>): Map<string, ts.PropertyAssignment | null> {
+        const decoratorOptions = new Map<string, ts.PropertyAssignment | null>();
+        options.forEach((value, key) => {
+            if (value !== null) {
+                decoratorOptions.set(key, ts.factory.createPropertyAssignment(ts.factory.createIdentifier(key), value));
+            }
+            else {
+                decoratorOptions.set(key, null);
+            }
+        });
+        return decoratorOptions;
+    }
+
+    private buildColumnDecoratorOptions(): Map<string, any> { //This function is used while adding the field
+        const options: any = new Map<string, any>();
+        //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 (!_.isEmpty(this.options.columnName)) {
+            options.set('name', `${this.options.columnName}`);
+        }
+
+        if (!_.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;
+    }
+
+    private buildColumnOptionsCode(): string {
+        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} }`;
+    }
+
+}

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

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

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

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IndexDecoratorManager = void 0;
+const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const FieldManager_1 = require("../../FieldManager");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+class IndexDecoratorManager {
+    constructor(options, fieldNode) {
+        this.options = options;
+        this.fieldNode = fieldNode;
+    }
+    isApplyDecorator() {
+        return this.options.index && this.options.field.relationType !== FieldManager_1.RelationType.ManyToMany;
+    }
+    decoratorName() {
+        return 'Index';
+    }
+    setFieldNode(fieldNode) {
+        this.fieldNode = fieldNode;
+    }
+    buildDecorator() {
+        const fieldSourceLines = [];
+        const changes = [];
+        // if (this.field.index) {
+        const indexDecoratorLine = `@Index()`;
+        fieldSourceLines.push(indexDecoratorLine);
+        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')];
+    }
+    //Updates the index decorator for the fieldNode based on the options provided
+    // @returns the updated property declaration
+    updateDecorator() {
+        if (!this.fieldNode)
+            throw new Error('Field node is required for updating the index decorator');
+        let newModifiers = [];
+        let existingModifiers = this.fieldNode.modifiers;
+        //Remove the Index decorator if the Index 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.createIndexDecorator()];
+            changes.push(...this.decoratorImports());
+        }
+        //If index decorator is present & index is required, no need to update the index decorator
+        const updatedProperty = typescript_1.default.factory.updatePropertyDeclaration(this.fieldNode, newModifiers, //newModifiers contains the updated index decorator
+        this.fieldNode.name, this.fieldNode.questionToken, this.fieldNode.type, this.fieldNode.initializer);
+        return [updatedProperty, changes];
+    }
+    createIndexDecorator() {
+        return typescript_1.default.factory.createDecorator(typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier('Index'), 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.IndexDecoratorManager = IndexDecoratorManager;
+//# sourceMappingURL=IndexDecoratorManager.js.map

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

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

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

@@ -0,0 +1,105 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange, RelationType } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+interface IndexDecoratorOptions {
+    index: boolean;
+    source: ts.SourceFile;
+    field: any;
+}
+
+export class IndexDecoratorManager implements DecoratorManager {
+
+    constructor(public options: IndexDecoratorOptions, public fieldNode?: PropertyDeclaration) { }
+    isApplyDecorator(): boolean {
+        return this.options.index && this.options.field.relationType !== RelationType.ManyToMany;
+    }
+    decoratorName(): string {
+        return 'Index';
+    }
+    setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+        this.fieldNode = fieldNode;
+    }
+    buildDecorator(): PartialAddFieldChange {
+        const fieldSourceLines = [];
+        const changes: Change[] = [];
+        // if (this.field.index) {
+        const indexDecoratorLine = `@Index()`;
+        fieldSourceLines.push(indexDecoratorLine);
+        changes.push(...this.decoratorImports());
+        // }
+        return {
+            filePath: this.options.source.fileName,
+            field: this.options.field,
+            changes: changes,
+            fieldSourceLines: fieldSourceLines,
+        };
+    }
+
+    decoratorImports(): Change[] {
+        return [insertImport(
+            this.options.source,
+            this.options.source.fileName,
+            this.decoratorName(),
+            'typeorm')]
+    }
+
+    //Updates the index decorator for the fieldNode based on the options provided
+    // @returns the updated property declaration
+    updateDecorator(): [PropertyDeclaration, Change[]] {
+        if (!this.fieldNode) throw new Error('Field node is required for updating the index decorator');
+
+        let newModifiers: ModifierLike[] | undefined = [];
+        let existingModifiers = this.fieldNode.modifiers;
+
+        //Remove the Index decorator if the Index decorator exists
+        //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+        newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+        //Add the column decorator if column decorator is required  
+        const changes: Change[] = [];  
+
+        if (this.isApplyDecorator()) {
+            newModifiers = [...newModifiers, this.createIndexDecorator()];
+            changes.push(...this.decoratorImports());
+        }
+
+        //If index decorator is present & index is required, no need to update the index decorator
+        const updatedProperty = ts.factory.updatePropertyDeclaration(
+            this.fieldNode,
+            newModifiers, //newModifiers contains the updated index decorator
+            this.fieldNode.name,
+            this.fieldNode.questionToken,
+            this.fieldNode.type,
+            this.fieldNode.initializer,
+        );
+        return [updatedProperty, changes];
+    }
+
+    private createIndexDecorator(): ts.ModifierLike {
+        return ts.factory.createDecorator(
+            ts.factory.createCallExpression(
+                ts.factory.createIdentifier('Index'),
+                undefined,
+                [],
+            ),
+        );
+    }
+
+    private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+    }
+
+    private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+        return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+    }
+
+    private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+        const callExpression = m.expression as ts.CallExpression;
+        const identifier = callExpression.expression as ts.Identifier;
+        return identifier.text === identifierName;
+    }
+
+
+}

package/src/code-builder/lib/field/decorator-managers/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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"}