@solidstarters/solid-code-builder 1.0.2 → 1.0.4
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.
- package/dist/code-builder/index.js +14 -5
- package/dist/code-builder/index.js.map +1 -1
- package/dist/code-builder/lib/field/FieldManager.d.ts +1 -1
- package/dist/code-builder/lib/field/FieldManager.js +7 -2
- package/dist/code-builder/lib/field/FieldManager.js.map +1 -1
- package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.d.ts +4 -0
- package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js +44 -2
- package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.js.map +1 -1
- package/dist/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.js +9 -6
- package/dist/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js +18 -8
- package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.js +5 -6
- package/dist/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.js +4 -5
- package/dist/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.js +4 -5
- package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.js +4 -5
- package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.js.map +1 -1
- package/dist/files/generate-module/__name@dasherize__.module.ts +4 -0
- package/files/generate-module/__name@dasherize__.module.ts +4 -0
- package/package.json +1 -1
- package/solidstarters-solid-code-builder-1.0.3.tgz +0 -0
- package/src/code-builder/index.ts +21 -6
- package/src/code-builder/lib/field/FieldManager.ts +8 -3
- package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts +75 -2
- package/src/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.ts +10 -6
- package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts +18 -10
- package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts +5 -6
- package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts +4 -5
- package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts +4 -5
- package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts +4 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyRelationFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA6E;AAE7E,gIAAyH;AAEzH,
|
|
1
|
+
{"version":3,"file":"ManyToManyRelationFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts"],"names":[],"mappings":"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"}
|
package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.js
CHANGED
|
@@ -8,11 +8,10 @@ const strings_1 = require("@angular-devkit/core/src/utils/strings");
|
|
|
8
8
|
const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
9
9
|
const ArrayDecoratorManager_1 = require("../../decorator-managers/dto/ArrayDecoratorManager");
|
|
10
10
|
const OptionalDecoratorManager_1 = require("../../decorator-managers/dto/OptionalDecoratorManager");
|
|
11
|
+
const StringDecoratorManager_1 = require("../../decorator-managers/dto/StringDecoratorManager");
|
|
11
12
|
const TransformDecoratorManager_1 = require("../../decorator-managers/dto/TransformDecoratorManager");
|
|
12
13
|
const FieldManager_1 = require("../../FieldManager");
|
|
13
14
|
const BaseFieldManagerForDto_1 = require("../base/BaseFieldManagerForDto");
|
|
14
|
-
const StringDecoratorManager_1 = require("../../decorator-managers/dto/StringDecoratorManager");
|
|
15
|
-
const helpers_1 = require("../../../model/helpers");
|
|
16
15
|
class ManyToOneRelationFieldManagerForDto extends BaseFieldManagerForDto_1.BaseFieldManagerForDto {
|
|
17
16
|
isJson() {
|
|
18
17
|
return false;
|
|
@@ -249,11 +248,11 @@ class ManyToOneRelationFieldManagerForDto extends BaseFieldManagerForDto_1.BaseF
|
|
|
249
248
|
return fieldChange;
|
|
250
249
|
}
|
|
251
250
|
}
|
|
252
|
-
inverseFieldImport(modelName,
|
|
251
|
+
inverseFieldImport(modelName, currentModuleName, source) {
|
|
253
252
|
const inverseEntityImportName = `update-${(0, strings_1.dasherize)(modelName)}.dto`;
|
|
254
|
-
const modulePath =
|
|
253
|
+
const modulePath = `src/${currentModuleName}`;
|
|
255
254
|
const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
|
|
256
|
-
return (0, FieldManager_1.safeInsertImport)(source, `Update${(0, strings_1.classify)(modelName)}Dto`, inverseEntityPath);
|
|
255
|
+
return (0, FieldManager_1.safeInsertImport)(source, `Update${(0, strings_1.classify)(modelName)}Dto`, inverseEntityPath, currentModuleName);
|
|
257
256
|
}
|
|
258
257
|
removeAdditionalField() {
|
|
259
258
|
const fieldChanges = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToOneRelationFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManyToOneRelationFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ManyToOneRelationFieldManagerForEntity = void 0;
|
|
7
7
|
const strings_1 = require("@angular-devkit/core/src/utils/strings");
|
|
8
8
|
const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
9
|
-
const helpers_1 = require("../../../model/helpers");
|
|
10
9
|
const OneToManyDecoratorManager_1 = require("../../decorator-managers/entity/OneToManyDecoratorManager");
|
|
11
10
|
const FieldManager_1 = require("../../FieldManager");
|
|
12
11
|
const BaseFieldManagerForEntity_1 = require("../base/BaseFieldManagerForEntity");
|
|
@@ -81,7 +80,7 @@ class ManyToOneRelationFieldManagerForEntity extends BaseFieldManagerForEntity_1
|
|
|
81
80
|
relatedFieldImport() {
|
|
82
81
|
const relatedEntityImportName = `${(0, strings_1.dasherize)(this.field.relationModelSingularName)}.entity`;
|
|
83
82
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${(0, strings_1.dasherize)(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
84
|
-
return (0, FieldManager_1.safeInsertImport)(this.source, (0, strings_1.classify)(this.field.relationModelSingularName), relatedEntityPath);
|
|
83
|
+
return (0, FieldManager_1.safeInsertImport)(this.source, (0, strings_1.classify)(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
|
|
85
84
|
}
|
|
86
85
|
isOneToMany() {
|
|
87
86
|
return (this.field.type === 'relation' && this.field.relationType === FieldManager_1.RelationType.ManyToOne && this.field.relationCreateInverse);
|
|
@@ -123,11 +122,11 @@ class ManyToOneRelationFieldManagerForEntity extends BaseFieldManagerForEntity_1
|
|
|
123
122
|
}
|
|
124
123
|
return fieldChange;
|
|
125
124
|
}
|
|
126
|
-
inverseFieldImport(modelName,
|
|
125
|
+
inverseFieldImport(modelName, currentModuleName, source) {
|
|
127
126
|
const inverseEntityImportName = `${(0, strings_1.dasherize)(modelName)}.entity`;
|
|
128
|
-
const modulePath =
|
|
127
|
+
const modulePath = `src/${currentModuleName}`;
|
|
129
128
|
const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
|
|
130
|
-
return (0, FieldManager_1.safeInsertImport)(source, (0, strings_1.classify)(modelName), inverseEntityPath);
|
|
129
|
+
return (0, FieldManager_1.safeInsertImport)(source, (0, strings_1.classify)(modelName), inverseEntityPath, currentModuleName);
|
|
131
130
|
}
|
|
132
131
|
addOrUpdateAdditionalField() {
|
|
133
132
|
const fieldChanges = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToOneRelationFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA6E;AAE7E,gIAAyH;AAEzH,
|
|
1
|
+
{"version":3,"file":"ManyToOneRelationFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
Binary file
|
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
apply,
|
|
9
9
|
branchAndMerge,
|
|
10
10
|
chain,
|
|
11
|
-
externalSchematic,
|
|
12
11
|
mergeWith,
|
|
13
12
|
move,
|
|
14
13
|
template,
|
|
@@ -18,18 +17,34 @@ import * as generateModelHelpers from './lib/model/helpers';
|
|
|
18
17
|
import { addField, SOLID_CORE_MODULE_NAME } from './lib/model/helpers';
|
|
19
18
|
import { removeField } from './lib/model/helpers';
|
|
20
19
|
import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
|
20
|
+
import { strings } from '@angular-devkit/core';
|
|
21
|
+
|
|
21
22
|
const generateModelUtils = { dasherize, classify, ...generateModelHelpers };
|
|
22
23
|
// You don't have to export the function as default. You can also have more than one rule factory
|
|
23
24
|
// per file.
|
|
24
25
|
export function addModule(options: any): Rule {
|
|
25
26
|
return (_tree: Tree, _context: SchematicContext) => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
const moduleName = options.module;
|
|
28
|
+
const moduleFolderPath = `src/${moduleName}`;
|
|
29
|
+
const moduleFilePath = `${moduleFolderPath}/${strings.dasherize(moduleName)}.module.ts`;
|
|
30
|
+
|
|
31
|
+
if (_tree.exists(moduleFilePath)) {
|
|
32
|
+
throw new Error(`Module file already exists at ${moduleFilePath}. Please use a unique module name.`);
|
|
33
|
+
}
|
|
34
|
+
const sourceTemplates: Source = apply(url('../files/generate-module'), [
|
|
35
|
+
template({
|
|
36
|
+
...generateModelUtils,
|
|
37
|
+
...options,
|
|
38
|
+
name: moduleName
|
|
30
39
|
}),
|
|
31
|
-
|
|
40
|
+
move(moduleFolderPath),
|
|
32
41
|
]);
|
|
42
|
+
//Link to nestjs schematic
|
|
43
|
+
return branchAndMerge(
|
|
44
|
+
chain([
|
|
45
|
+
mergeWith(sourceTemplates, MergeStrategy.Overwrite),
|
|
46
|
+
updateChecksum(options?.module, options?.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModule, options)),
|
|
47
|
+
]))(_tree, _context);
|
|
33
48
|
};
|
|
34
49
|
}
|
|
35
50
|
|
|
@@ -19,7 +19,7 @@ import { ManyToOneRelationFieldHandler } from './field-managers/relation/ManyToO
|
|
|
19
19
|
import { RichTextFieldHandler } from './field-managers/rich-text/RichTextFieldHandler';
|
|
20
20
|
import { ShortTextFieldHandler } from './field-managers/short-text/ShortTextFieldHandler';
|
|
21
21
|
import { UUIDFieldHandler } from './field-managers/uuid/UUIDFieldHandler';
|
|
22
|
-
import { SOLID_CORE_MODULE_NAME } from '../model/helpers';
|
|
22
|
+
import { SOLID_CORE_MODULE_NAME, SOLID_CORE_MODULE_NPM_PACKAGE_NAME } from '../model/helpers';
|
|
23
23
|
|
|
24
24
|
export const MAX_EMAIL_LENGTH = 254;
|
|
25
25
|
export const UUID_REGEX = `^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`;
|
|
@@ -282,10 +282,15 @@ export class ManagerForDtoOptions {
|
|
|
282
282
|
) {}
|
|
283
283
|
}
|
|
284
284
|
// insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
285
|
-
export function safeInsertImport(source: ts.SourceFile, symbolName: string, importFileName: string ): Change {
|
|
285
|
+
export function safeInsertImport(source: ts.SourceFile, symbolName: string, importFileName: string, currentModuleName: string ): Change {
|
|
286
286
|
// Check if in current source, there exists a class with the same symbolName
|
|
287
287
|
if (importFileName.startsWith(`src/${SOLID_CORE_MODULE_NAME }`)) {
|
|
288
|
-
|
|
288
|
+
if (currentModuleName === SOLID_CORE_MODULE_NAME) {
|
|
289
|
+
importFileName = importFileName.replace(`src/${SOLID_CORE_MODULE_NAME }`, 'src');
|
|
290
|
+
}
|
|
291
|
+
else {
|
|
292
|
+
importFileName = SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
|
|
293
|
+
}
|
|
289
294
|
}
|
|
290
295
|
|
|
291
296
|
if (!getClassNode(symbolName, source)){
|
|
@@ -9,6 +9,9 @@ interface JoinTableDecoratorOptions {
|
|
|
9
9
|
field: any;
|
|
10
10
|
fieldName: string;
|
|
11
11
|
modelName: string;
|
|
12
|
+
relationJoinTableName: string;
|
|
13
|
+
relationTableModelName: string;
|
|
14
|
+
relationTableModelNameInverse: string;
|
|
12
15
|
}
|
|
13
16
|
|
|
14
17
|
export class JoinTableDecoratorManager implements DecoratorManager {
|
|
@@ -35,7 +38,7 @@ export class JoinTableDecoratorManager implements DecoratorManager {
|
|
|
35
38
|
// changes.push(decoratorImport);
|
|
36
39
|
// }
|
|
37
40
|
fieldSourceLines.push(
|
|
38
|
-
`@${this.decoratorName()}()`,
|
|
41
|
+
`@${this.decoratorName()}(${this.buildRelationOptionsCode()})`,
|
|
39
42
|
);
|
|
40
43
|
changes.push(...this.decoratorImports());
|
|
41
44
|
|
|
@@ -92,14 +95,84 @@ export class JoinTableDecoratorManager implements DecoratorManager {
|
|
|
92
95
|
return [updatedProperty, changes];
|
|
93
96
|
}
|
|
94
97
|
|
|
98
|
+
private buildRelationOptionsCode(): string {
|
|
99
|
+
const options: Record<string, string | Record<string, string>> = {};
|
|
100
|
+
|
|
101
|
+
// Add 'name' attribute
|
|
102
|
+
options['name'] = this.options.relationJoinTableName
|
|
103
|
+
? `"${this.options.relationJoinTableName}"`
|
|
104
|
+
: `"${this.options.fieldName}"`;
|
|
105
|
+
|
|
106
|
+
// Add 'joinColumn' attribute
|
|
107
|
+
options['joinColumn'] = {
|
|
108
|
+
name: `"${this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`}"`,
|
|
109
|
+
};
|
|
110
|
+
|
|
111
|
+
// Add 'inverseJoinColumn' attribute
|
|
112
|
+
options['inverseJoinColumn'] = {
|
|
113
|
+
name: `"${this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`}"`,
|
|
114
|
+
};
|
|
115
|
+
|
|
116
|
+
return `{ ${Object.entries(options)
|
|
117
|
+
.map(([key, value]) => {
|
|
118
|
+
if (typeof value === 'string') {
|
|
119
|
+
return `${key}: ${value}`;
|
|
120
|
+
}
|
|
121
|
+
const nestedOptions = Object.entries(value)
|
|
122
|
+
.map(([nestedKey, nestedValue]) => `${nestedKey}: ${nestedValue}`)
|
|
123
|
+
.join(', ');
|
|
124
|
+
return `${key}: { ${nestedOptions} }`;
|
|
125
|
+
})
|
|
126
|
+
.join(', ')} }`;
|
|
127
|
+
}
|
|
128
|
+
|
|
95
129
|
private createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
|
|
96
130
|
let existingRelationOptions: ts.ObjectLiteralElementLike[] = this.existingDecoratorOptions(existingDecorator);
|
|
97
131
|
|
|
98
132
|
// const mergedRelationOptions: ObjectLiteralElementLike[] = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
|
|
99
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}`
|
|
141
|
+
)
|
|
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
|
+
];
|
|
164
|
+
|
|
165
|
+
// Merge existing and new options, avoiding duplicates
|
|
166
|
+
const mergedRelationOptions = [
|
|
167
|
+
...existingRelationOptions.filter(
|
|
168
|
+
(option) => !(ts.isPropertyAssignment(option) && option.name.getText() === 'name')
|
|
169
|
+
),
|
|
170
|
+
...newRelationOptions,
|
|
171
|
+
];
|
|
172
|
+
|
|
100
173
|
// Re-create the decorator with the merged decorator options
|
|
101
174
|
const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
|
|
102
|
-
const argumentsArray: ts.Expression[] = this.createDecoratorArguments(
|
|
175
|
+
const argumentsArray: ts.Expression[] = this.createDecoratorArguments(mergedRelationOptions);
|
|
103
176
|
const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
|
|
104
177
|
return ts.factory.createDecorator(call)
|
|
105
178
|
}
|
|
@@ -48,23 +48,27 @@ export class UniqueIndexDecoratorManager {
|
|
|
48
48
|
updateDecorator(): [ClassDeclaration, Change[]] {
|
|
49
49
|
if (!this.classNode) throw new Error('Class node is required for updating the unique index decorator');
|
|
50
50
|
|
|
51
|
-
let
|
|
52
|
-
let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.classNode.modifiers;
|
|
51
|
+
let existingModifierLikes: ts.NodeArray<ModifierLike> | undefined = this.classNode.modifiers;
|
|
53
52
|
|
|
54
53
|
// Get the existing unique index decorator if it exists
|
|
55
|
-
const existingUniqueIndexDecorator = this.findUniqueIndexDecorator(
|
|
54
|
+
const existingUniqueIndexDecorator = this.findUniqueIndexDecorator(existingModifierLikes);
|
|
56
55
|
|
|
57
56
|
//Remove the Index decorator if the Index decorator exists
|
|
58
|
-
|
|
57
|
+
const existingModifiers = this.filterNonDecorators(existingModifierLikes);
|
|
58
|
+
const newDecorators = [...this.filterOtherDecorators(this.decoratorName(), existingModifierLikes), ...this.filterOtherIndexDecorators(this.decoratorName(), this.options, existingModifierLikes)];
|
|
59
59
|
|
|
60
60
|
//Add the column decorator if column decorator is required
|
|
61
61
|
const changes: Change[] = [];
|
|
62
62
|
|
|
63
63
|
if (this.isApplyDecorator()) {
|
|
64
|
-
newModifiers = [...newModifiers, this.createUniqueIndexDecorator(existingUniqueIndexDecorator)];
|
|
64
|
+
// newModifiers = [...newModifiers, this.createUniqueIndexDecorator(existingUniqueIndexDecorator)];
|
|
65
|
+
newDecorators.push(this.createUniqueIndexDecorator(existingUniqueIndexDecorator));
|
|
65
66
|
changes.push(...this.decoratorImports());
|
|
66
67
|
}
|
|
67
68
|
|
|
69
|
+
//Since the order matters i.e decorators should appear above the export keyword
|
|
70
|
+
const newModifierLikes = [...newDecorators, ...existingModifiers];
|
|
71
|
+
|
|
68
72
|
// If field node is provided, replace the class members with the updated field node
|
|
69
73
|
const newMembers = this.classNode.members.filter((member) => {
|
|
70
74
|
// Check if the member is a PropertyDeclaration
|
|
@@ -82,7 +86,7 @@ export class UniqueIndexDecoratorManager {
|
|
|
82
86
|
// Update the class node with the new modifiers
|
|
83
87
|
const updatedClass = ts.factory.updateClassDeclaration(
|
|
84
88
|
this.classNode,
|
|
85
|
-
|
|
89
|
+
newModifierLikes,
|
|
86
90
|
this.classNode.name,
|
|
87
91
|
this.classNode.typeParameters,
|
|
88
92
|
this.classNode.heritageClauses,
|
|
@@ -104,6 +104,9 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
|
|
|
104
104
|
field: this.field,
|
|
105
105
|
fieldName: this.fieldName(),
|
|
106
106
|
modelName: this.modelName,
|
|
107
|
+
relationJoinTableName: this.field.relationJoinTableName,
|
|
108
|
+
relationTableModelName: this.field.relationTableModelName,
|
|
109
|
+
relationTableModelNameInverse: this. field.relationTableModelNameInverse
|
|
107
110
|
},
|
|
108
111
|
);
|
|
109
112
|
this.uniqueIndexDecoratorManager = new UniqueIndexDecoratorManager(
|
|
@@ -257,16 +260,21 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
|
|
|
257
260
|
updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
|
|
258
261
|
changes.push(...decoratorChanges);
|
|
259
262
|
|
|
260
|
-
//
|
|
261
|
-
//
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
263
|
+
// Currently additional field support is only limited to relation fields for entities, so there is no need to update the class nodes
|
|
264
|
+
// Since unique index decorator supported is only for fields which are not relation fields.
|
|
265
|
+
// Also the current additional field algorithm is not able to deal with the class where the primary field operations modifies the class node
|
|
266
|
+
if (!this.isAdditionalFieldRequired()) {
|
|
267
|
+
// Update the property declaration node in the class hierarchy with the updated property declaration node
|
|
268
|
+
// Then calculate the replace changes
|
|
269
|
+
this.uniqueIndexDecoratorManager.setFieldNode(updatedPropertyDeclarationNode);
|
|
270
|
+
// Apply the unique index decorator changes at the class node level
|
|
271
|
+
const [updatedClassNode, uniqueIndexDecoratorChanges] = this.uniqueIndexDecoratorChanges();
|
|
272
|
+
changes.push(...uniqueIndexDecoratorChanges);
|
|
273
|
+
changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), this.getClassNode(this.modelName, source), source)); //FIXME: avoid this.modelName to passed in for avoiding statefullness
|
|
274
|
+
}
|
|
275
|
+
else {
|
|
276
|
+
changes.push (...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
|
|
277
|
+
}
|
|
270
278
|
return {
|
|
271
279
|
filePath: source.fileName,
|
|
272
280
|
field: field,
|
package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts
CHANGED
|
@@ -4,11 +4,10 @@ import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.
|
|
|
4
4
|
import { Change } from '@schematics/angular/utility/change';
|
|
5
5
|
import { ArrayDecoratorManager } from '../../decorator-managers/dto/ArrayDecoratorManager';
|
|
6
6
|
import { OptionalDecoratorManager } from '../../decorator-managers/dto/OptionalDecoratorManager';
|
|
7
|
+
import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
|
|
7
8
|
import { TransformDecoratorManager } from '../../decorator-managers/dto/TransformDecoratorManager';
|
|
8
9
|
import { DecoratorManager, DecoratorType, DtoSourceType, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, createSourceFile, safeInsertImport } from '../../FieldManager';
|
|
9
10
|
import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
|
|
10
|
-
import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
|
|
11
|
-
import { SOLID_CORE_MODULE_NAME } from '../../../model/helpers';
|
|
12
11
|
|
|
13
12
|
export class ManyToManyRelationFieldManagerForDto
|
|
14
13
|
extends BaseFieldManagerForDto
|
|
@@ -192,11 +191,11 @@ export class ManyToManyRelationFieldManagerForDto
|
|
|
192
191
|
|
|
193
192
|
}
|
|
194
193
|
|
|
195
|
-
private inverseFieldImport(modelName: string,
|
|
194
|
+
private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
|
|
196
195
|
const inverseEntityImportName = `update-${dasherize(modelName)}.dto`;
|
|
197
|
-
const modulePath =
|
|
196
|
+
const modulePath = `src/${currentModuleName}`;
|
|
198
197
|
const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
|
|
199
|
-
return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath);
|
|
198
|
+
return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath, currentModuleName);
|
|
200
199
|
}
|
|
201
200
|
|
|
202
201
|
private addAdditionalInverseField() : FieldChange {
|
|
@@ -441,7 +440,7 @@ export class ManyToManyRelationFieldManagerForDto
|
|
|
441
440
|
relatedFieldImport(): Change {
|
|
442
441
|
const relatedEntityImportName = `update-${dasherize(this.field.relationModelSingularName)}.dto`;
|
|
443
442
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
444
|
-
return safeInsertImport(this.source, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
443
|
+
return safeInsertImport(this.source, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
|
|
445
444
|
// return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
446
445
|
} //Uncomment this method while implementing many-to-many relation changes
|
|
447
446
|
}
|
|
@@ -2,7 +2,6 @@ import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
|
|
|
2
2
|
import { Tree } from '@angular-devkit/schematics';
|
|
3
3
|
import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
|
4
4
|
import { Change } from '@schematics/angular/utility/change';
|
|
5
|
-
import { SOLID_CORE_MODULE_NAME } from '../../../model/helpers';
|
|
6
5
|
import { ManyToManyDecoratorManager } from '../../decorator-managers/entity/ManyToManyDecoratorManager';
|
|
7
6
|
import { OneToManyDecoratorManager } from '../../decorator-managers/entity/OneToManyDecoratorManager';
|
|
8
7
|
import { DecoratorManager, FieldChange, FieldManager, FieldType, createSourceFile, safeInsertImport } from '../../FieldManager';
|
|
@@ -90,7 +89,7 @@ export class ManyToManyRelationFieldManagerForEntity
|
|
|
90
89
|
relatedFieldImport(): Change {
|
|
91
90
|
const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
|
|
92
91
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
93
|
-
return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath);
|
|
92
|
+
return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
|
|
94
93
|
}
|
|
95
94
|
|
|
96
95
|
override removeAdditionalField(): FieldChange {
|
|
@@ -137,13 +136,13 @@ export class ManyToManyRelationFieldManagerForEntity
|
|
|
137
136
|
return fieldChange;
|
|
138
137
|
}
|
|
139
138
|
|
|
140
|
-
private inverseFieldImport(modelName: string,
|
|
139
|
+
private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
|
|
141
140
|
const inverseEntityImportName = `${dasherize(modelName)}.entity`;
|
|
142
|
-
const modulePath =
|
|
141
|
+
const modulePath = `src/${currentModuleName}`;
|
|
143
142
|
|
|
144
143
|
const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
|
|
145
144
|
|
|
146
|
-
return safeInsertImport(source, `${classify(modelName)}`, inverseEntityPath);
|
|
145
|
+
return safeInsertImport(source, `${classify(modelName)}`, inverseEntityPath, currentModuleName);
|
|
147
146
|
}
|
|
148
147
|
|
|
149
148
|
override addOrUpdateAdditionalField(): FieldChange[] {
|
package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts
CHANGED
|
@@ -4,11 +4,10 @@ import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.
|
|
|
4
4
|
import { Change } from '@schematics/angular/utility/change';
|
|
5
5
|
import { ArrayDecoratorManager } from '../../decorator-managers/dto/ArrayDecoratorManager';
|
|
6
6
|
import { OptionalDecoratorManager } from '../../decorator-managers/dto/OptionalDecoratorManager';
|
|
7
|
+
import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
|
|
7
8
|
import { TransformDecoratorManager } from '../../decorator-managers/dto/TransformDecoratorManager';
|
|
8
9
|
import { DecoratorManager, DecoratorType, DtoSourceType, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, createSourceFile, safeInsertImport } from '../../FieldManager';
|
|
9
10
|
import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
|
|
10
|
-
import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
|
|
11
|
-
import { SOLID_CORE_MODULE_NAME } from '../../../model/helpers';
|
|
12
11
|
|
|
13
12
|
export class ManyToOneRelationFieldManagerForDto
|
|
14
13
|
extends BaseFieldManagerForDto
|
|
@@ -306,13 +305,13 @@ export class ManyToOneRelationFieldManagerForDto
|
|
|
306
305
|
}
|
|
307
306
|
}
|
|
308
307
|
|
|
309
|
-
private inverseFieldImport(modelName: string,
|
|
308
|
+
private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
|
|
310
309
|
const inverseEntityImportName = `update-${dasherize(modelName)}.dto`;
|
|
311
|
-
const modulePath =
|
|
310
|
+
const modulePath = `src/${currentModuleName}`;
|
|
312
311
|
|
|
313
312
|
const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
|
|
314
313
|
|
|
315
|
-
return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath);
|
|
314
|
+
return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath, currentModuleName);
|
|
316
315
|
}
|
|
317
316
|
|
|
318
317
|
override removeAdditionalField(): FieldChange[] {
|
package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts
CHANGED
|
@@ -2,7 +2,6 @@ import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
|
|
|
2
2
|
import { Tree } from '@angular-devkit/schematics';
|
|
3
3
|
import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
|
4
4
|
import { Change } from '@schematics/angular/utility/change';
|
|
5
|
-
import { SOLID_CORE_MODULE_NAME } from '../../../model/helpers';
|
|
6
5
|
import { OneToManyDecoratorManager } from '../../decorator-managers/entity/OneToManyDecoratorManager';
|
|
7
6
|
import { DecoratorManager, FieldChange, FieldManager, FieldType, RelationType, createSourceFile, safeInsertImport } from '../../FieldManager';
|
|
8
7
|
import {
|
|
@@ -112,7 +111,7 @@ export class ManyToOneRelationFieldManagerForEntity
|
|
|
112
111
|
relatedFieldImport(): Change {
|
|
113
112
|
const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
|
|
114
113
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
115
|
-
return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath);
|
|
114
|
+
return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
|
|
116
115
|
}
|
|
117
116
|
|
|
118
117
|
private isOneToMany(): boolean {
|
|
@@ -163,12 +162,12 @@ export class ManyToOneRelationFieldManagerForEntity
|
|
|
163
162
|
return fieldChange;
|
|
164
163
|
}
|
|
165
164
|
|
|
166
|
-
private inverseFieldImport(modelName: string,
|
|
165
|
+
private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
|
|
167
166
|
const inverseEntityImportName = `${dasherize(modelName)}.entity`;
|
|
168
|
-
const modulePath =
|
|
167
|
+
const modulePath = `src/${currentModuleName}`;
|
|
169
168
|
|
|
170
169
|
const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
|
|
171
|
-
return safeInsertImport(source, classify(modelName), inverseEntityPath);
|
|
170
|
+
return safeInsertImport(source, classify(modelName), inverseEntityPath, currentModuleName);
|
|
172
171
|
}
|
|
173
172
|
|
|
174
173
|
override addOrUpdateAdditionalField(): FieldChange[] {
|