@solidstarters/solid-code-builder 1.0.4 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.d.ts +30 -0
  2. package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.js +119 -0
  3. package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.js.map +1 -0
  4. package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js +27 -24
  5. package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js.map +1 -1
  6. package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.d.ts +1 -0
  7. package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js +9 -1
  8. package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js.map +1 -1
  9. package/package.json +2 -2
  10. package/src/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.ts +176 -0
  11. package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts +49 -43
  12. package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts +12 -1
package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.d.ts ADDED
@@ -0,0 +1,30 @@
1
+ import ts, { PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
2
+ import { Change } from "@schematics/angular/utility/change";
3
+ import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
4
+ interface JoinColumnDecoratorOptions {
5
+ isManyToOneRelationOwner: boolean;
6
+ source: ts.SourceFile;
7
+ field: any;
8
+ fieldName: string;
9
+ relationModelFieldName?: string;
10
+ }
11
+ export declare class JoinColumnDecoratorManager implements DecoratorManager {
12
+ options: JoinColumnDecoratorOptions;
13
+ fieldNode?: PropertyDeclaration | undefined;
14
+ constructor(options: JoinColumnDecoratorOptions, fieldNode?: PropertyDeclaration | undefined);
15
+ isApplyDecorator(): boolean;
16
+ decoratorName(): string;
17
+ buildDecorator(): PartialAddFieldChange;
18
+ decoratorImports(): Change[];
19
+ setFieldNode(fieldNode: PropertyDeclaration): void;
20
+ updateDecorator(): [PropertyDeclaration, Change[]];
21
+ private buildRelationOptionsCode;
22
+ private createDecorator;
23
+ private createDecoratorArguments;
24
+ private existingDecoratorOptions;
25
+ private findDecorator;
26
+ private filterOtherDecorators;
27
+ private filterNonDecorators;
28
+ private containsIdentifierName;
29
+ }
30
+ export {};
package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.js ADDED
@@ -0,0 +1,119 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.JoinColumnDecoratorManager = void 0;
7
+ const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
8
+ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
9
+ class JoinColumnDecoratorManager {
10
+ constructor(options, fieldNode) {
11
+ this.options = options;
12
+ this.fieldNode = fieldNode;
13
+ }
14
+ isApplyDecorator() {
15
+ return this.options.isManyToOneRelationOwner;
16
+ }
17
+ decoratorName() {
18
+ return 'JoinColumn';
19
+ }
20
+ buildDecorator() {
21
+ const changes = [];
22
+ const fieldSourceLines = [];
23
+ fieldSourceLines.push(`@${this.decoratorName()}(${this.buildRelationOptionsCode()})`);
24
+ changes.push(...this.decoratorImports());
25
+ return {
26
+ filePath: this.options.source.fileName,
27
+ field: this.options.field,
28
+ changes: changes,
29
+ fieldSourceLines: fieldSourceLines,
30
+ };
31
+ }
32
+ decoratorImports() {
33
+ return [(0, ast_utils_1.insertImport)(this.options.source, this.options.source.fileName, this.decoratorName(), 'typeorm')];
34
+ }
35
+ setFieldNode(fieldNode) {
36
+ this.fieldNode = fieldNode;
37
+ }
38
+ updateDecorator() {
39
+ if (!this.fieldNode)
40
+ throw new Error('Field node is required for updating the JoinColumn decorator');
41
+ let newModifiers = [];
42
+ const existingModifiers = this.fieldNode.modifiers;
43
+ const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
44
+ newModifiers = [
45
+ ...this.filterNonDecorators(existingModifiers),
46
+ ...this.filterOtherDecorators(this.decoratorName(), existingModifiers),
47
+ ];
48
+ const changes = [];
49
+ if (this.isApplyDecorator()) {
50
+ newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
51
+ changes.push(...this.decoratorImports());
52
+ }
53
+ const updatedProperty = typescript_1.default.factory.updatePropertyDeclaration(this.fieldNode, newModifiers, this.fieldNode.name, this.fieldNode.questionToken, this.fieldNode.type, this.fieldNode.initializer);
54
+ return [updatedProperty, changes];
55
+ }
56
+ buildRelationOptionsCode() {
57
+ const options = {};
58
+ if (this.options.relationModelFieldName) {
59
+ options['name'] = `"${this.options.relationModelFieldName}_id"`;
60
+ return `{ ${Object.entries(options)
61
+ .map(([key, value]) => `${key}: ${value}`)
62
+ .join(', ')} }`;
63
+ }
64
+ return '';
65
+ }
66
+ createDecorator(existingDecorator) {
67
+ const existingOptions = this.existingDecoratorOptions(existingDecorator);
68
+ const newOptions = [];
69
+ if (this.options.relationModelFieldName) {
70
+ newOptions.push(typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(`${this.options.relationModelFieldName}_id`)));
71
+ }
72
+ const mergedOptions = [
73
+ ...existingOptions.filter((option) => !(typescript_1.default.isPropertyAssignment(option) && option.name.getText() === 'name')),
74
+ ...newOptions,
75
+ ];
76
+ const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
77
+ const argumentsArray = this.createDecoratorArguments(mergedOptions);
78
+ const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
79
+ return typescript_1.default.factory.createDecorator(call);
80
+ }
81
+ createDecoratorArguments(options) {
82
+ const argumentsArray = [];
83
+ if (options.length > 0) {
84
+ const optionsObjectLiteral = typescript_1.default.factory.createObjectLiteralExpression(options);
85
+ argumentsArray.push(optionsObjectLiteral);
86
+ }
87
+ return argumentsArray;
88
+ }
89
+ existingDecoratorOptions(existingDecorator) {
90
+ const options = [];
91
+ if (existingDecorator) {
92
+ const existingCallExpression = existingDecorator.expression;
93
+ if (existingCallExpression.arguments.length > 0) {
94
+ const firstArgument = existingCallExpression.arguments[0];
95
+ if (!typescript_1.default.isObjectLiteralExpression(firstArgument)) {
96
+ throw new Error('JoinColumn decorator 1st argument must be an object literal');
97
+ }
98
+ options.push(...firstArgument.properties);
99
+ }
100
+ }
101
+ return options;
102
+ }
103
+ findDecorator(name, existingModifiers) {
104
+ return existingModifiers === null || existingModifiers === void 0 ? void 0 : existingModifiers.filter((m) => m.kind === typescript_1.default.SyntaxKind.Decorator).map((m) => m).find((m) => this.containsIdentifierName(m, name));
105
+ }
106
+ filterOtherDecorators(name, existingModifiers) {
107
+ return (existingModifiers === null || existingModifiers === void 0 ? void 0 : existingModifiers.filter((m) => m.kind === typescript_1.default.SyntaxKind.Decorator).map((m) => m).filter((m) => !this.containsIdentifierName(m, name))) || [];
108
+ }
109
+ filterNonDecorators(existingModifiers) {
110
+ return (existingModifiers === null || existingModifiers === void 0 ? void 0 : existingModifiers.filter((m) => m.kind !== typescript_1.default.SyntaxKind.Decorator).map((m) => m)) || [];
111
+ }
112
+ containsIdentifierName(decorator, name) {
113
+ const callExpression = decorator.expression;
114
+ const identifier = callExpression.expression;
115
+ return identifier.text === name;
116
+ }
117
+ }
118
+ exports.JoinColumnDecoratorManager = JoinColumnDecoratorManager;
119
+ //# sourceMappingURL=JoinColumnDecoratorManager.js.map
package/dist/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"JoinColumnDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.ts"],"names":[],"mappings":"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"}
package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js CHANGED
@@ -68,18 +68,19 @@ class JoinTableDecoratorManager {
68
68
  }
69
69
  buildRelationOptionsCode() {
70
70
  const options = {};
71
- // Add 'name' attribute
72
- options['name'] = this.options.relationJoinTableName
73
- ? `"${this.options.relationJoinTableName}"`
74
- : `"${this.options.fieldName}"`;
75
- // Add 'joinColumn' attribute
76
- options['joinColumn'] = {
77
- name: `"${this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`}"`,
78
- };
79
- // Add 'inverseJoinColumn' attribute
80
- options['inverseJoinColumn'] = {
81
- name: `"${this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`}"`,
82
- };
71
+ if (this.options.relationJoinTableName) {
72
+ options['name'] = `${this.options.relationJoinTableName}`;
73
+ }
74
+ if (this.options.relationTableModelName) {
75
+ options['joinColumn'] = {
76
+ name: `${this.options.relationTableModelName}_id`,
77
+ };
78
+ }
79
+ if (this.options.relationTableModelNameInverse) {
80
+ options['inverseJoinColumn'] = {
81
+ name: `${this.options.relationTableModelNameInverse}_id`,
82
+ };
83
+ }
83
84
  return `{ ${Object.entries(options)
84
85
  .map(([key, value]) => {
85
86
  if (typeof value === 'string') {
@@ -94,18 +95,20 @@ class JoinTableDecoratorManager {
94
95
  }
95
96
  createDecorator(existingDecorator) {
96
97
  let existingRelationOptions = this.existingDecoratorOptions(existingDecorator);
97
- // const mergedRelationOptions: ObjectLiteralElementLike[] = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
98
- const newRelationOptions = [
99
- typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(this.options.relationJoinTableName
100
- ? `${this.options.relationJoinTableName}`
101
- : `${this.options.fieldName}`)),
102
- typescript_1.default.factory.createPropertyAssignment('joinColumn', typescript_1.default.factory.createObjectLiteralExpression([
103
- typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`))
104
- ])),
105
- typescript_1.default.factory.createPropertyAssignment('inverseJoinColumn', typescript_1.default.factory.createObjectLiteralExpression([
106
- typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`))
107
- ])),
108
- ];
98
+ const newRelationOptions = [];
99
+ if (this.options.relationJoinTableName) {
100
+ newRelationOptions.push(typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(this.options.relationJoinTableName)));
101
+ }
102
+ if (this.options.relationTableModelName) {
103
+ newRelationOptions.push(typescript_1.default.factory.createPropertyAssignment('joinColumn', typescript_1.default.factory.createObjectLiteralExpression([
104
+ typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(`${this.options.relationTableModelName}_id`)),
105
+ ])));
106
+ }
107
+ if (this.options.relationTableModelNameInverse) {
108
+ newRelationOptions.push(typescript_1.default.factory.createPropertyAssignment('inverseJoinColumn', typescript_1.default.factory.createObjectLiteralExpression([
109
+ typescript_1.default.factory.createPropertyAssignment('name', typescript_1.default.factory.createStringLiteral(`${this.options.relationTableModelNameInverse}_id`)),
110
+ ])));
111
+ }
109
112
  // Merge existing and new options, avoiding duplicates
110
113
  const mergedRelationOptions = [
111
114
  ...existingRelationOptions.filter((option) => !(typescript_1.default.isPropertyAssignment(option) && option.name.getText() === 'name')),
package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JoinTableDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinTableDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts"],"names":[],"mappings":"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"}
package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare abstract class BaseFieldManagerForEntity implements FieldManager
14
14
  indexDecoratorManager: IndexDecoratorManager;
15
15
  columnDecoratorManager: ColumnDecoratorManager;
16
16
  manyToOneDecoratorManager: ManyToOneDecoratorManager;
17
+ joinColumnDecoratorManager: DecoratorManager;
17
18
  manyToManyDecoratorManager: DecoratorManager;
18
19
  joinTableDecoratorManager: DecoratorManager;
19
20
  uniqueIndexDecoratorManager: UniqueIndexDecoratorManager;
package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js CHANGED
@@ -16,6 +16,7 @@ const ManyToManyDecoratorManager_1 = require("../../decorator-managers/entity/Ma
16
16
  const JoinTableDecoratorManager_1 = require("../../decorator-managers/entity/JoinTableDecoratorManager");
17
17
  const FieldManager_2 = require("../../FieldManager");
18
18
  const UniqueIndexDecoratorManager_1 = require("../../decorator-managers/entity/UniqueIndexDecoratorManager");
19
+ const JoinColumnDecoratorManager_1 = require("../../decorator-managers/entity/JoinColumnDecoratorManager");
19
20
  class BaseFieldManagerForEntity {
20
21
  constructor(tree, moduleName, modelName, field) {
21
22
  var _a;
@@ -47,6 +48,13 @@ class BaseFieldManagerForEntity {
47
48
  fieldName: this.fieldName(),
48
49
  modelName: this.modelName,
49
50
  }, fieldPropertyDeclarationNode);
51
+ this.joinColumnDecoratorManager = new JoinColumnDecoratorManager_1.JoinColumnDecoratorManager({
52
+ isManyToOneRelationOwner: this.field.relationType === FieldManager_2.RelationType.ManyToOne,
53
+ source: this.source,
54
+ field: this.field,
55
+ fieldName: this.fieldName(),
56
+ relationModelFieldName: this.field.relationModelFieldName
57
+ });
50
58
  this.manyToManyDecoratorManager = new ManyToManyDecoratorManager_1.ManyToManyDecoratorManager({
51
59
  isManyToMany: this.isManyToMany(),
52
60
  relationModelName: this.field.relationModelSingularName,
@@ -350,7 +358,7 @@ class BaseFieldManagerForEntity {
350
358
  }
351
359
  }
352
360
  decoratorManagers() {
353
- return [this.indexDecoratorManager, this.columnDecoratorManager, this.manyToOneDecoratorManager, this.manyToManyDecoratorManager, this.joinTableDecoratorManager];
361
+ return [this.indexDecoratorManager, this.columnDecoratorManager, this.manyToOneDecoratorManager, this.joinColumnDecoratorManager, this.manyToManyDecoratorManager, this.joinTableDecoratorManager];
354
362
  }
355
363
  addAdditionalField() {
356
364
  throw new Error(`addAdditionalField method not implemented for field ${this.fieldName()} of type ${this.field.type}`);
package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@solidstarters/solid-code-builder",
3
- "version": "1.0.4",
4
- "description": "A blank schematics",
3
+ "version": "1.0.6",
4
+ "description": "This package is use to generate code for the @solidstarters projects",
5
5
  "private": false,
6
6
  "publishConfig": {
7
7
  "access": "public"
package/src/code-builder/lib/field/decorator-managers/entity/JoinColumnDecoratorManager.ts ADDED
@@ -0,0 +1,176 @@
1
+ import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
2
+ import { insertImport } from "@schematics/angular/utility/ast-utils";
3
+ import { Change } from "@schematics/angular/utility/change";
4
+ import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
5
+
6
+ interface JoinColumnDecoratorOptions {
7
+ isManyToOneRelationOwner: boolean;
8
+ source: ts.SourceFile;
9
+ field: any;
10
+ fieldName: string;
11
+ relationModelFieldName?: string;
12
+ }
13
+
14
+ export class JoinColumnDecoratorManager implements DecoratorManager {
15
+ constructor(
16
+ public options: JoinColumnDecoratorOptions,
17
+ public fieldNode?: PropertyDeclaration,
18
+ ) { }
19
+
20
+ isApplyDecorator(): boolean {
21
+ return this.options.isManyToOneRelationOwner;
22
+ }
23
+
24
+ decoratorName(): string {
25
+ return 'JoinColumn';
26
+ }
27
+
28
+ buildDecorator(): PartialAddFieldChange {
29
+ const changes: Change[] = [];
30
+ const fieldSourceLines: string[] = [];
31
+
32
+ fieldSourceLines.push(`@${this.decoratorName()}(${this.buildRelationOptionsCode()})`);
33
+ changes.push(...this.decoratorImports());
34
+
35
+ return {
36
+ filePath: this.options.source.fileName,
37
+ field: this.options.field,
38
+ changes: changes,
39
+ fieldSourceLines: fieldSourceLines,
40
+ };
41
+ }
42
+
43
+ decoratorImports(): Change[] {
44
+ return [insertImport(
45
+ this.options.source,
46
+ this.options.source.fileName,
47
+ this.decoratorName(),
48
+ 'typeorm'
49
+ )];
50
+ }
51
+
52
+ setFieldNode(fieldNode: PropertyDeclaration): void {
53
+ this.fieldNode = fieldNode;
54
+ }
55
+
56
+ updateDecorator(): [PropertyDeclaration, Change[]] {
57
+ if (!this.fieldNode) throw new Error('Field node is required for updating the JoinColumn decorator');
58
+
59
+ let newModifiers: ModifierLike[] = [];
60
+ const existingModifiers = this.fieldNode.modifiers;
61
+
62
+ const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
63
+
64
+ newModifiers = [
65
+ ...this.filterNonDecorators(existingModifiers),
66
+ ...this.filterOtherDecorators(this.decoratorName(), existingModifiers),
67
+ ];
68
+
69
+ const changes: Change[] = [];
70
+
71
+ if (this.isApplyDecorator()) {
72
+ newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
73
+ changes.push(...this.decoratorImports());
74
+ }
75
+
76
+ const updatedProperty = ts.factory.updatePropertyDeclaration(
77
+ this.fieldNode,
78
+ newModifiers,
79
+ this.fieldNode.name,
80
+ this.fieldNode.questionToken,
81
+ this.fieldNode.type,
82
+ this.fieldNode.initializer,
83
+ );
84
+
85
+ return [updatedProperty, changes];
86
+ }
87
+
88
+ private buildRelationOptionsCode(): string {
89
+ const options: Record<string, string> = {};
90
+
91
+ if (this.options.relationModelFieldName) {
92
+ options['name'] = `"${this.options.relationModelFieldName}_id"`;
93
+ return `{ ${Object.entries(options)
94
+ .map(([key, value]) => `${key}: ${value}`)
95
+ .join(', ')} }`;
96
+ }
97
+ return '';
98
+ }
99
+
100
+ private createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
101
+ const existingOptions: ts.ObjectLiteralElementLike[] = this.existingDecoratorOptions(existingDecorator);
102
+
103
+ const newOptions: ts.ObjectLiteralElementLike[] = [];
104
+
105
+ if (this.options.relationModelFieldName) {
106
+ newOptions.push(
107
+ ts.factory.createPropertyAssignment(
108
+ 'name',
109
+ ts.factory.createStringLiteral(`${this.options.relationModelFieldName}_id`)
110
+ )
111
+ );
112
+ }
113
+
114
+ const mergedOptions = [
115
+ ...existingOptions.filter(
116
+ (option) => !(ts.isPropertyAssignment(option) && option.name.getText() === 'name')
117
+ ),
118
+ ...newOptions,
119
+ ];
120
+
121
+ const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
122
+ const argumentsArray: ts.Expression[] = this.createDecoratorArguments(mergedOptions);
123
+ const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
124
+ return ts.factory.createDecorator(call);
125
+ }
126
+
127
+ private createDecoratorArguments(options: ts.ObjectLiteralElementLike[]) {
128
+ const argumentsArray: ts.Expression[] = [];
129
+ if (options.length > 0) {
130
+ const optionsObjectLiteral = ts.factory.createObjectLiteralExpression(options);
131
+ argumentsArray.push(optionsObjectLiteral);
132
+ }
133
+ return argumentsArray;
134
+ }
135
+
136
+ private existingDecoratorOptions(existingDecorator: ts.Decorator | undefined): ts.ObjectLiteralElementLike[] {
137
+ const options: ts.ObjectLiteralElementLike[] = [];
138
+ if (existingDecorator) {
139
+ const existingCallExpression = existingDecorator.expression as ts.CallExpression;
140
+ if (existingCallExpression.arguments.length > 0) {
141
+ const firstArgument = existingCallExpression.arguments[0];
142
+ if (!ts.isObjectLiteralExpression(firstArgument)) {
143
+ throw new Error('JoinColumn decorator 1st argument must be an object literal');
144
+ }
145
+ options.push(...firstArgument.properties);
146
+ }
147
+ }
148
+ return options;
149
+ }
150
+
151
+ private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
152
+ return existingModifiers
153
+ ?.filter((m) => m.kind === ts.SyntaxKind.Decorator)
154
+ .map((m) => m as ts.Decorator)
155
+ .find((m) => this.containsIdentifierName(m, name));
156
+ }
157
+
158
+ private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
159
+ return existingModifiers
160
+ ?.filter((m) => m.kind === ts.SyntaxKind.Decorator)
161
+ .map((m) => m as ts.Decorator)
162
+ .filter((m) => !this.containsIdentifierName(m, name)) || [];
163
+ }
164
+
165
+ private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
166
+ return existingModifiers
167
+ ?.filter((m) => m.kind !== ts.SyntaxKind.Decorator)
168
+ .map((m) => m as ts.Modifier) || [];
169
+ }
170
+
171
+ private containsIdentifierName(decorator: ts.Decorator, name: string): boolean {
172
+ const callExpression = decorator.expression as ts.CallExpression;
173
+ const identifier = callExpression.expression as ts.Identifier;
174
+ return identifier.text === name;
175
+ }
176
+ }
package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts CHANGED
@@ -98,20 +98,21 @@ export class JoinTableDecoratorManager implements DecoratorManager {
98
98
  private buildRelationOptionsCode(): string {
99
99
  const options: Record<string, string | Record<string, string>> = {};
100
100
 
101
- // Add 'name' attribute
102
- options['name'] = this.options.relationJoinTableName
103
- ? `"${this.options.relationJoinTableName}"`
104
- : `"${this.options.fieldName}"`;
101
+ if (this.options.relationJoinTableName) {
102
+ options['name'] = `${this.options.relationJoinTableName}`;
103
+ }
105
104
 
106
- // Add 'joinColumn' attribute
107
- options['joinColumn'] = {
108
- name: `"${this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`}"`,
109
- };
105
+ if (this.options.relationTableModelName) {
106
+ options['joinColumn'] = {
107
+ name: `${this.options.relationTableModelName}_id`,
108
+ };
109
+ }
110
110
 
111
- // Add 'inverseJoinColumn' attribute
112
- options['inverseJoinColumn'] = {
113
- name: `"${this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`}"`,
114
- };
111
+ if (this.options.relationTableModelNameInverse) {
112
+ options['inverseJoinColumn'] = {
113
+ name: `${this.options.relationTableModelNameInverse}_id`,
114
+ };
115
+ }
115
116
 
116
117
  return `{ ${Object.entries(options)
117
118
  .map(([key, value]) => {
@@ -129,38 +130,43 @@ export class JoinTableDecoratorManager implements DecoratorManager {
129
130
  private createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
130
131
  let existingRelationOptions: ts.ObjectLiteralElementLike[] = this.existingDecoratorOptions(existingDecorator);
131
132
 
132
- // const mergedRelationOptions: ObjectLiteralElementLike[] = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
133
-
134
- const newRelationOptions: ts.ObjectLiteralElementLike[] = [
135
- ts.factory.createPropertyAssignment(
136
- 'name',
137
- ts.factory.createStringLiteral(
138
- this.options.relationJoinTableName
139
- ? `${this.options.relationJoinTableName}`
140
- : `${this.options.fieldName}`
133
+ const newRelationOptions: ts.ObjectLiteralElementLike[] = [];
134
+ if (this.options.relationJoinTableName) {
135
+ newRelationOptions.push(
136
+ ts.factory.createPropertyAssignment(
137
+ 'name',
138
+ ts.factory.createStringLiteral(this.options.relationJoinTableName)
141
139
  )
142
- ),
143
- ts.factory.createPropertyAssignment(
144
- 'joinColumn',
145
- ts.factory.createObjectLiteralExpression([
146
- ts.factory.createPropertyAssignment(
147
- 'name',
148
- ts.factory.createStringLiteral(
149
- this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`)
150
- )
151
- ])
152
- ),
153
- ts.factory.createPropertyAssignment(
154
- 'inverseJoinColumn',
155
- ts.factory.createObjectLiteralExpression([
156
- ts.factory.createPropertyAssignment(
157
- 'name',
158
- ts.factory.createStringLiteral(
159
- this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`)
160
- )
161
- ])
162
- ),
163
- ];
140
+ );
141
+ }
142
+
143
+ if (this.options.relationTableModelName) {
144
+ newRelationOptions.push(
145
+ ts.factory.createPropertyAssignment(
146
+ 'joinColumn',
147
+ ts.factory.createObjectLiteralExpression([
148
+ ts.factory.createPropertyAssignment(
149
+ 'name',
150
+ ts.factory.createStringLiteral(`${this.options.relationTableModelName}_id`)
151
+ ),
152
+ ])
153
+ )
154
+ );
155
+ }
156
+
157
+ if (this.options.relationTableModelNameInverse) {
158
+ newRelationOptions.push(
159
+ ts.factory.createPropertyAssignment(
160
+ 'inverseJoinColumn',
161
+ ts.factory.createObjectLiteralExpression([
162
+ ts.factory.createPropertyAssignment(
163
+ 'name',
164
+ ts.factory.createStringLiteral(`${this.options.relationTableModelNameInverse}_id`)
165
+ ),
166
+ ])
167
+ )
168
+ );
169
+ }
164
170
 
165
171
  // Merge existing and new options, avoiding duplicates
166
172
  const mergedRelationOptions = [
package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts CHANGED
@@ -27,12 +27,14 @@ import { ManyToManyDecoratorManager } from '../../decorator-managers/entity/Many
27
27
  import { JoinTableDecoratorManager } from '../../decorator-managers/entity/JoinTableDecoratorManager';
28
28
  import { RelationType } from "../../FieldManager";
29
29
  import { UniqueIndexDecoratorManager } from '../../decorator-managers/entity/UniqueIndexDecoratorManager';
30
+ import { JoinColumnDecoratorManager } from '../../decorator-managers/entity/JoinColumnDecoratorManager';
30
31
 
31
32
  export abstract class BaseFieldManagerForEntity implements FieldManager {
32
33
  source: SourceFile;
33
34
  indexDecoratorManager: IndexDecoratorManager;
34
35
  columnDecoratorManager: ColumnDecoratorManager;
35
36
  manyToOneDecoratorManager: ManyToOneDecoratorManager;
37
+ joinColumnDecoratorManager: DecoratorManager;
36
38
  manyToManyDecoratorManager: DecoratorManager;
37
39
  joinTableDecoratorManager: DecoratorManager;
38
40
  uniqueIndexDecoratorManager: UniqueIndexDecoratorManager;
@@ -84,6 +86,15 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
84
86
  },
85
87
  fieldPropertyDeclarationNode,
86
88
  );
89
+ this.joinColumnDecoratorManager = new JoinColumnDecoratorManager(
90
+ {
91
+ isManyToOneRelationOwner: this.field.relationType === RelationType.ManyToOne,
92
+ source: this.source,
93
+ field: this.field,
94
+ fieldName: this.fieldName(),
95
+ relationModelFieldName: this.field.relationModelFieldName
96
+ },
97
+ );
87
98
  this.manyToManyDecoratorManager = new ManyToManyDecoratorManager(
88
99
  {
89
100
  isManyToMany: this.isManyToMany(),
@@ -490,7 +501,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
490
501
  }
491
502
 
492
503
  private decoratorManagers(): DecoratorManager[] {
493
- return [this.indexDecoratorManager, this.columnDecoratorManager, this.manyToOneDecoratorManager, this.manyToManyDecoratorManager, this.joinTableDecoratorManager];
504
+ return [this.indexDecoratorManager, this.columnDecoratorManager, this.manyToOneDecoratorManager, this.joinColumnDecoratorManager, this.manyToManyDecoratorManager, this.joinTableDecoratorManager];
494
505
  }
495
506
 
496
507
  protected addAdditionalField(): FieldChange[] {