@solidstarters/solid-code-builder 1.0.1 → 1.0.3
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 +21 -8
- 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 +14 -1
- 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 +1 -1
- 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 -9
- 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 +6 -5
- 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 +5 -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 +5 -4
- 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 +5 -6
- package/dist/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.js.map +1 -1
- package/dist/code-builder/lib/model/helpers.d.ts +3 -0
- package/dist/code-builder/lib/model/helpers.js +8 -3
- package/dist/code-builder/lib/model/helpers.js.map +1 -1
- package/dist/files/generate-model/entities/__model@dasherize__.entity.ts +2 -2
- package/dist/files/generate-model/services/__model@dasherize__.service.ts +8 -7
- package/dist/files/generate-module/__name@dasherize__.module.ts +4 -0
- package/files/generate-model/entities/__model@dasherize__.entity.ts +2 -2
- package/files/generate-model/services/__model@dasherize__.service.ts +8 -7
- package/files/generate-module/__name@dasherize__.module.ts +4 -0
- package/package.json +2 -2
- package/src/code-builder/index.ts +31 -11
- package/src/code-builder/lib/field/FieldManager.ts +15 -1
- package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts +75 -2
- package/src/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.ts +1 -1
- package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts +18 -11
- package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts +6 -5
- package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts +6 -5
- package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts +6 -4
- package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts +6 -6
- package/src/code-builder/lib/model/helpers.ts +7 -2
- package/solidstarters-solid-code-builder-1.0.1.tgz +0 -0
|
@@ -50,24 +50,34 @@ const generateModelHelpers = __importStar(require("./lib/model/helpers"));
|
|
|
50
50
|
const helpers_1 = require("./lib/model/helpers");
|
|
51
51
|
const helpers_2 = require("./lib/model/helpers");
|
|
52
52
|
const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
53
|
+
const core_1 = require("@angular-devkit/core");
|
|
53
54
|
const generateModelUtils = Object.assign({ dasherize: strings_1.dasherize, classify: strings_1.classify }, generateModelHelpers);
|
|
54
55
|
// You don't have to export the function as default. You can also have more than one rule factory
|
|
55
56
|
// per file.
|
|
56
57
|
function addModule(options) {
|
|
57
58
|
return (_tree, _context) => {
|
|
59
|
+
const moduleName = options.module;
|
|
60
|
+
const moduleFolderPath = `src/${moduleName}`;
|
|
61
|
+
const moduleFilePath = `${moduleFolderPath}/${core_1.strings.dasherize(moduleName)}.module.ts`;
|
|
62
|
+
if (_tree.exists(moduleFilePath)) {
|
|
63
|
+
throw new Error(`Module file already exists at ${moduleFilePath}. Please use a unique module name.`);
|
|
64
|
+
}
|
|
65
|
+
const sourceTemplates = (0, schematics_1.apply)((0, schematics_1.url)('../files/generate-module'), [
|
|
66
|
+
(0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, generateModelUtils), options), { name: moduleName })),
|
|
67
|
+
(0, schematics_1.move)(moduleFolderPath),
|
|
68
|
+
]);
|
|
58
69
|
//Link to nestjs schematic
|
|
59
|
-
return (0, schematics_1.chain)([
|
|
60
|
-
(0, schematics_1.
|
|
61
|
-
name: options === null || options === void 0 ? void 0 : options.module,
|
|
62
|
-
}),
|
|
70
|
+
return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
|
|
71
|
+
(0, schematics_1.mergeWith)(sourceTemplates, schematics_1.MergeStrategy.Overwrite),
|
|
63
72
|
updateChecksum(options === null || options === void 0 ? void 0 : options.module, options === null || options === void 0 ? void 0 : options.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModule, options)),
|
|
64
|
-
]);
|
|
73
|
+
]))(_tree, _context);
|
|
65
74
|
};
|
|
66
75
|
}
|
|
67
76
|
function refreshModel(options) {
|
|
68
77
|
return (tree, _context) => {
|
|
78
|
+
const modulePath = (options.module === helpers_1.SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
|
|
69
79
|
// If the model related code is not present, then add it by call addModel, else call update field with the fields provided
|
|
70
|
-
const modelEntityFilePath =
|
|
80
|
+
const modelEntityFilePath = `${modulePath}/entities/${(0, strings_1.dasherize)(options.model)}.entity.ts`;
|
|
71
81
|
// console.log('Model Entity File Path: ', modelEntityFilePath);
|
|
72
82
|
if (!tree.exists(modelEntityFilePath)) {
|
|
73
83
|
// console.log('Model does not exist, adding model');
|
|
@@ -81,10 +91,12 @@ function refreshModel(options) {
|
|
|
81
91
|
}
|
|
82
92
|
function addModel(options) {
|
|
83
93
|
return (tree, context) => {
|
|
94
|
+
// If the module is solid-core, the code needs to be generated in src/ since solid-core-module is a library & there is only 1 module
|
|
95
|
+
const modulePath = (options.module === helpers_1.SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
|
|
84
96
|
//Link to a templates folder
|
|
85
97
|
const sourceTemplates = (0, schematics_1.apply)((0, schematics_1.url)('../files/generate-model'), [
|
|
86
98
|
(0, schematics_1.template)(Object.assign(Object.assign({}, generateModelUtils), options)),
|
|
87
|
-
(0, schematics_1.move)(
|
|
99
|
+
(0, schematics_1.move)(modulePath),
|
|
88
100
|
]);
|
|
89
101
|
return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
|
|
90
102
|
addModuleImportsAndMetadata(options),
|
|
@@ -137,7 +149,8 @@ function removeFields(options) {
|
|
|
137
149
|
function addModuleImportsAndMetadata(options) {
|
|
138
150
|
return (tree, _context) => {
|
|
139
151
|
// Handle the module imports
|
|
140
|
-
const
|
|
152
|
+
const modulePath = (options.module === helpers_1.SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
|
|
153
|
+
const moduleFilePath = `${modulePath}/${(0, strings_1.dasherize)(options.module)}.module.ts`;
|
|
141
154
|
const moduleImports = [
|
|
142
155
|
{ symbolName: `TypeOrmModule`, importPath: `@nestjs/typeorm` },
|
|
143
156
|
generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Entity),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/code-builder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/code-builder/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,5 +102,5 @@ export declare class ManagerForDtoOptions {
|
|
|
102
102
|
sourceType: DtoSourceType;
|
|
103
103
|
constructor(sourceType: DtoSourceType);
|
|
104
104
|
}
|
|
105
|
-
export declare function safeInsertImport(source: ts.SourceFile, symbolName: string, importFileName: string): Change;
|
|
105
|
+
export declare function safeInsertImport(source: ts.SourceFile, symbolName: string, importFileName: string, currentModuleName: string): Change;
|
|
106
106
|
export declare function IsBigInt(validationOptions?: ValidationOptions): (object: Object, propertyName: string) => void;
|
|
@@ -30,6 +30,7 @@ const ManyToOneRelationFieldHandler_1 = require("./field-managers/relation/ManyT
|
|
|
30
30
|
const RichTextFieldHandler_1 = require("./field-managers/rich-text/RichTextFieldHandler");
|
|
31
31
|
const ShortTextFieldHandler_1 = require("./field-managers/short-text/ShortTextFieldHandler");
|
|
32
32
|
const UUIDFieldHandler_1 = require("./field-managers/uuid/UUIDFieldHandler");
|
|
33
|
+
const helpers_1 = require("../model/helpers");
|
|
33
34
|
exports.MAX_EMAIL_LENGTH = 254;
|
|
34
35
|
exports.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}$`;
|
|
35
36
|
var SolidFieldType;
|
|
@@ -171,6 +172,10 @@ function getFieldHandler(tree, moduleName, modelName, field) {
|
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
function createSourceFile(tree, filePath) {
|
|
175
|
+
//if filePath starts with src/solid-core, replace it with src/
|
|
176
|
+
if (filePath.startsWith(`src/${helpers_1.SOLID_CORE_MODULE_NAME}`)) {
|
|
177
|
+
filePath = filePath.replace(`src/${helpers_1.SOLID_CORE_MODULE_NAME}`, 'src');
|
|
178
|
+
}
|
|
174
179
|
return typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.Latest, true);
|
|
175
180
|
}
|
|
176
181
|
function getClassNode(className, source) {
|
|
@@ -207,8 +212,16 @@ class ManagerForDtoOptions {
|
|
|
207
212
|
}
|
|
208
213
|
exports.ManagerForDtoOptions = ManagerForDtoOptions;
|
|
209
214
|
// insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
210
|
-
function safeInsertImport(source, symbolName, importFileName) {
|
|
215
|
+
function safeInsertImport(source, symbolName, importFileName, currentModuleName) {
|
|
211
216
|
// Check if in current source, there exists a class with the same symbolName
|
|
217
|
+
if (importFileName.startsWith(`src/${helpers_1.SOLID_CORE_MODULE_NAME}`)) {
|
|
218
|
+
if (currentModuleName === helpers_1.SOLID_CORE_MODULE_NAME) {
|
|
219
|
+
importFileName = importFileName.replace(`src/${helpers_1.SOLID_CORE_MODULE_NAME}`, 'src');
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
importFileName = helpers_1.SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
212
225
|
if (!getClassNode(symbolName, source)) {
|
|
213
226
|
return (0, ast_utils_1.insertImport)(source, source.fileName, symbolName, importFileName);
|
|
214
227
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FieldManager.js","sourceRoot":"","sources":["../../../../src/code-builder/lib/field/FieldManager.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"FieldManager.js","sourceRoot":"","sources":["../../../../src/code-builder/lib/field/FieldManager.ts"],"names":[],"mappings":"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"}
|
package/dist/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.d.ts
CHANGED
|
@@ -7,6 +7,9 @@ interface JoinTableDecoratorOptions {
|
|
|
7
7
|
field: any;
|
|
8
8
|
fieldName: string;
|
|
9
9
|
modelName: string;
|
|
10
|
+
relationJoinTableName: string;
|
|
11
|
+
relationTableModelName: string;
|
|
12
|
+
relationTableModelNameInverse: string;
|
|
10
13
|
}
|
|
11
14
|
export declare class JoinTableDecoratorManager implements DecoratorManager {
|
|
12
15
|
options: JoinTableDecoratorOptions;
|
|
@@ -18,6 +21,7 @@ export declare class JoinTableDecoratorManager implements DecoratorManager {
|
|
|
18
21
|
decoratorImports(): Change[];
|
|
19
22
|
setFieldNode(fieldNode: PropertyDeclaration): void;
|
|
20
23
|
updateDecorator(): [PropertyDeclaration, Change[]];
|
|
24
|
+
private buildRelationOptionsCode;
|
|
21
25
|
private createDecorator;
|
|
22
26
|
private createDecoratorArguments;
|
|
23
27
|
private existingDecoratorOptions;
|
|
@@ -30,7 +30,7 @@ class JoinTableDecoratorManager {
|
|
|
30
30
|
// if (decoratorImport) {
|
|
31
31
|
// changes.push(decoratorImport);
|
|
32
32
|
// }
|
|
33
|
-
fieldSourceLines.push(`@${this.decoratorName()}()`);
|
|
33
|
+
fieldSourceLines.push(`@${this.decoratorName()}(${this.buildRelationOptionsCode()})`);
|
|
34
34
|
changes.push(...this.decoratorImports());
|
|
35
35
|
return {
|
|
36
36
|
filePath: this.options.source.fileName,
|
|
@@ -66,12 +66,54 @@ class JoinTableDecoratorManager {
|
|
|
66
66
|
this.fieldNode.name, this.fieldNode.questionToken, this.fieldNode.type, this.fieldNode.initializer);
|
|
67
67
|
return [updatedProperty, changes];
|
|
68
68
|
}
|
|
69
|
+
buildRelationOptionsCode() {
|
|
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
|
+
};
|
|
83
|
+
return `{ ${Object.entries(options)
|
|
84
|
+
.map(([key, value]) => {
|
|
85
|
+
if (typeof value === 'string') {
|
|
86
|
+
return `${key}: ${value}`;
|
|
87
|
+
}
|
|
88
|
+
const nestedOptions = Object.entries(value)
|
|
89
|
+
.map(([nestedKey, nestedValue]) => `${nestedKey}: ${nestedValue}`)
|
|
90
|
+
.join(', ');
|
|
91
|
+
return `${key}: { ${nestedOptions} }`;
|
|
92
|
+
})
|
|
93
|
+
.join(', ')} }`;
|
|
94
|
+
}
|
|
69
95
|
createDecorator(existingDecorator) {
|
|
70
96
|
let existingRelationOptions = this.existingDecoratorOptions(existingDecorator);
|
|
71
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
|
+
];
|
|
109
|
+
// Merge existing and new options, avoiding duplicates
|
|
110
|
+
const mergedRelationOptions = [
|
|
111
|
+
...existingRelationOptions.filter((option) => !(typescript_1.default.isPropertyAssignment(option) && option.name.getText() === 'name')),
|
|
112
|
+
...newRelationOptions,
|
|
113
|
+
];
|
|
72
114
|
// Re-create the decorator with the merged decorator options
|
|
73
115
|
const decoratorIdentifier = typescript_1.default.factory.createIdentifier(this.decoratorName());
|
|
74
|
-
const argumentsArray = this.createDecoratorArguments(
|
|
116
|
+
const argumentsArray = this.createDecoratorArguments(mergedRelationOptions);
|
|
75
117
|
const call = typescript_1.default.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
|
|
76
118
|
return typescript_1.default.factory.createDecorator(call);
|
|
77
119
|
}
|
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":";;;;;;AAAA,gIAAuI;AACvI,qEAAqE;
|
|
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/decorator-managers/entity/UniqueIndexDecoratorManager.js
CHANGED
|
@@ -47,7 +47,7 @@ class UniqueIndexDecoratorManager {
|
|
|
47
47
|
// Get the existing unique index decorator if it exists
|
|
48
48
|
const existingUniqueIndexDecorator = this.findUniqueIndexDecorator(existingModifiers);
|
|
49
49
|
//Remove the Index decorator if the Index decorator exists
|
|
50
|
-
newModifiers = [...this.filterOtherDecorators(this.decoratorName(), existingModifiers), ...this.filterOtherIndexDecorators(this.decoratorName(), this.options, existingModifiers)
|
|
50
|
+
newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers), ...this.filterOtherIndexDecorators(this.decoratorName(), this.options, existingModifiers)];
|
|
51
51
|
//Add the column decorator if column decorator is required
|
|
52
52
|
const changes = [];
|
|
53
53
|
if (this.isApplyDecorator()) {
|
package/dist/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UniqueIndexDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.ts"],"names":[],"mappings":";;;;;;AAAA,gIAAmL;AACnL,qEAAqE;AAWrE,MAAa,2BAA2B;IACpC,YAAmB,OAAoC,EAAS,SAA2B,EAAS,SAA+B;QAAhH,YAAO,GAAP,OAAO,CAA6B;QAAS,cAAS,GAAT,SAAS,CAAkB;QAAS,cAAS,GAAT,SAAS,CAAsB;IAAI,CAAC;IACxI,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IACD,aAAa;QACT,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,YAAY,CAAC,SAAiC;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,cAAc;QACV,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,kBAAkB,GAAG,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS,yCAAyC,CAAC;QACvG,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzC,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ;YACtC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,OAAO,EAAE,OAAO;YAChB,gBAAgB,EAAE,gBAAgB;SACrC,CAAC;IACN,CAAC;IAED,gBAAgB;QACZ,OAAO,CAAC,IAAA,wBAAY,EAChB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAC5B,IAAI,CAAC,aAAa,EAAE,EACpB,SAAS,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,6EAA6E;IAC7E,4CAA4C;IAC5C,eAAe;QACX,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QAEvG,IAAI,YAAY,GAA+B,EAAE,CAAC;QAClD,IAAI,iBAAiB,GAA2C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;QAEzF,uDAAuD;QACvD,MAAM,4BAA4B,GAAG,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;QAEtF,0DAA0D;QAC1D,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"UniqueIndexDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/entity/UniqueIndexDecoratorManager.ts"],"names":[],"mappings":";;;;;;AAAA,gIAAmL;AACnL,qEAAqE;AAWrE,MAAa,2BAA2B;IACpC,YAAmB,OAAoC,EAAS,SAA2B,EAAS,SAA+B;QAAhH,YAAO,GAAP,OAAO,CAA6B;QAAS,cAAS,GAAT,SAAS,CAAkB;QAAS,cAAS,GAAT,SAAS,CAAsB;IAAI,CAAC;IACxI,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IACD,aAAa;QACT,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,YAAY,CAAC,SAAiC;QAC1C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,cAAc;QACV,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,kBAAkB,GAAG,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS,yCAAyC,CAAC;QACvG,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzC,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ;YACtC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,OAAO,EAAE,OAAO;YAChB,gBAAgB,EAAE,gBAAgB;SACrC,CAAC;IACN,CAAC;IAED,gBAAgB;QACZ,OAAO,CAAC,IAAA,wBAAY,EAChB,IAAI,CAAC,OAAO,CAAC,MAAM,EACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAC5B,IAAI,CAAC,aAAa,EAAE,EACpB,SAAS,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,6EAA6E;IAC7E,4CAA4C;IAC5C,eAAe;QACX,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QAEvG,IAAI,YAAY,GAA+B,EAAE,CAAC;QAClD,IAAI,iBAAiB,GAA2C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;QAEzF,uDAAuD;QACvD,MAAM,4BAA4B,GAAG,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;QAEtF,0DAA0D;QAC1D,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,iBAAiB,CAAC,EAAE,GAAG,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAElO,4DAA4D;QAC5D,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC1B,YAAY,GAAG,CAAC,GAAG,YAAY,EAAE,IAAI,CAAC,0BAA0B,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAChG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,mFAAmF;QACnF,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YACxD,+CAA+C;YAC/C,IAAI,oBAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnC,uDAAuD;gBACvD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACzC,OAAO,UAAU,KAAK,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,+CAA+C;YACjG,CAAC;YACD,OAAO,IAAI,CAAC,CAAC,uCAAuC;QACxD,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,+CAA+C;QAC/C,MAAM,YAAY,GAAG,oBAAE,CAAC,OAAO,CAAC,sBAAsB,CAClD,IAAI,CAAC,SAAS,EACd,YAAY,EACZ,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,cAAc,EAC7B,IAAI,CAAC,SAAS,CAAC,eAAe,EAC9B,UAAU,CACb,CAAC;QACF,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IAEO,wBAAwB,CAAC,iBAA4D;QACzF,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB;aACvC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;aACnD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;aACjE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAClE,GAAG,EAAE;YACN,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;IAEO,0BAA0B,CAAC,iBAA2C;QAC1E,gDAAgD;QAChD,IAAI,+CAA+C,GAAkC,EAAE,CAAC;QACxF,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAClC,+DAA+D;YAC/D,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,UAA+B,CAAC;YACjF,qDAAqD;YACrD,IAAI,sBAAsB,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,oBAAE,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAAC,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;gBAAC,CAAC;gBACtL,MAAM,+BAA+B,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAC;gBAC1G,+CAA+C,CAAC,IAAI,CAAC,GAAG,+BAA+B,CAAC,UAAU,CAAC,CAAC;YACxG,CAAC;QACL,CAAC;QAED,0EAA0E;QAC1E,MAAM,2BAA2B,GAAG,IAAI,CAAC,iCAAiC,EAAE,CAAC;QAC7E,MAAM,sBAAsB,GAA+B,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAA4B,CAAC;QAE/J,mDAAmD;QACnD,MAAM,6BAA6B,GAAG,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAAC;QACrF,YAAY;QACZ,MAAM,wBAAwB,GAAG,+CAA+C,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,WAAC,OAAA,CAAC,6BAA6B,CAAC,QAAQ,CAAC,MAAA,EAAE,CAAC,IAAI,0CAAE,WAAqB,CAAC,CAAA,EAAA,CAAC,CAAC;QACvK,sBAAsB,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;QAEzD,0EAA0E;QAC1E,MAAM,mBAAmB,GAAG,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC9E,MAAM,WAAW,GAAG,oBAAE,CAAC,OAAO,CAAC,4BAA4B,CACvD;YACI,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACtD,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC;SACnD,EACD,KAAK,CACR,CAAA;QACD,MAAM,gBAAgB,GAAG,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;QAC1F,MAAM,IAAI,GAAG,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,SAAS,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC9G,OAAO,oBAAE,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAEO,iCAAiC;QACrC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,oBAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAEO,kCAAkC,CAAC,OAA0C;QACjF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAwC,CAAC;QACzE,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC3B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACjB,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAE,CAAC,OAAO,CAAC,wBAAwB,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YAC5G,CAAC;iBACI,CAAC;gBACF,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEO,qBAAqB,CAAC,IAAY,EAAE,iBAA4D;QACpG,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzL,CAAC;IAEO,0BAA0B,CAAC,IAAY,EAAE,gBAA6C,EAAE,iBAA4D;QACxJ,OAAO,iBAAiB;YACpB,CAAC,CAAC,iBAAiB;iBACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;iBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC;iBAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBACjD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC5E,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEO,mBAAmB,CAAC,iBAA4D;QACpF,OAAO,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrI,CAAC;IAEO,sBAAsB,CAAC,CAAe,EAAE,cAAsB;QAClE,MAAM,cAAc,GAAG,CAAC,CAAC,UAA+B,CAAC;QACzD,MAAM,UAAU,GAAG,cAAc,CAAC,UAA2B,CAAC;QAC9D,OAAO,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC;IAC9C,CAAC;IAEO,qBAAqB,CAAC,CAAe,EAAE,SAAiB;QAC5D,uDAAuD;QACvD,MAAM,cAAc,GAAG,CAAC,CAAC,UAA+B,CAAC;QACzD,MAAM,IAAI,GAAG,cAAc,CAAC,SAAS,CAAC;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,oBAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC;YACrF,sEAAsE;YACtE,mBAAmB,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;YACzH,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YACtC,OAAO,CAAA;QACX,CAAC;QACD,IAAI,CAAC,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAEvC,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ;AA/LD,kEA+LC"}
|
|
@@ -25,7 +25,6 @@ class BaseFieldManagerForEntity {
|
|
|
25
25
|
// TODO: Note that the source file instance is created during construction
|
|
26
26
|
// So every operation should use a new instance of the field manager, so updated tree/source is used before each operation
|
|
27
27
|
this.source = (0, FieldManager_1.createSourceFile)(tree, `src/${(0, strings_1.dasherize)(moduleName)}/entities/${(0, strings_1.dasherize)(modelName)}.entity.ts`);
|
|
28
|
-
// this.relationInverseSource = createSourceFile(tree, `src/${dasherize(this.field.relationModelSingularName)}/dtos/create-${dasherize(this.field.relationModelSingularName)}.dto.ts`)
|
|
29
28
|
const fieldPropertyDeclarationNode = (_a = this.getFieldIdentifierNode(this.fieldName(), this.source)) === null || _a === void 0 ? void 0 : _a.parent;
|
|
30
29
|
this.indexDecoratorManager = new IndexDecoratorManager_1.IndexDecoratorManager({ index: this.field.index, source: this.source, field: this.field }, fieldPropertyDeclarationNode);
|
|
31
30
|
this.columnDecoratorManager = new ColumnDecoratorManager_1.ColumnDecoratorManager({
|
|
@@ -65,6 +64,9 @@ class BaseFieldManagerForEntity {
|
|
|
65
64
|
field: this.field,
|
|
66
65
|
fieldName: this.fieldName(),
|
|
67
66
|
modelName: this.modelName,
|
|
67
|
+
relationJoinTableName: this.field.relationJoinTableName,
|
|
68
|
+
relationTableModelName: this.field.relationTableModelName,
|
|
69
|
+
relationTableModelNameInverse: this.field.relationTableModelNameInverse
|
|
68
70
|
});
|
|
69
71
|
this.uniqueIndexDecoratorManager = new UniqueIndexDecoratorManager_1.UniqueIndexDecoratorManager({ unique: this.field.unique, fieldName: this.fieldName(), source: this.source, field: this.field }, this.getClassNode(this.modelName, this.source));
|
|
70
72
|
}
|
|
@@ -176,14 +178,21 @@ class BaseFieldManagerForEntity {
|
|
|
176
178
|
const [updatedPropertyDeclarationNodeTransformed, decoratorChanges] = this.applyUpdateDecoratorTransformations(updatedPropertyDeclarationNode, ...decoratorManagers);
|
|
177
179
|
updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
|
|
178
180
|
changes.push(...decoratorChanges);
|
|
179
|
-
//
|
|
180
|
-
//
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
181
|
+
// Currently additional field support is only limited to relation fields for entities, so there is no need to update the class nodes
|
|
182
|
+
// Since unique index decorator supported is only for fields which are not relation fields.
|
|
183
|
+
// Also the current additional field algorithm is not able to deal with the class where the primary field operations modifies the class node
|
|
184
|
+
if (!this.isAdditionalFieldRequired()) {
|
|
185
|
+
// Update the property declaration node in the class hierarchy with the updated property declaration node
|
|
186
|
+
// Then calculate the replace changes
|
|
187
|
+
this.uniqueIndexDecoratorManager.setFieldNode(updatedPropertyDeclarationNode);
|
|
188
|
+
// Apply the unique index decorator changes at the class node level
|
|
189
|
+
const [updatedClassNode, uniqueIndexDecoratorChanges] = this.uniqueIndexDecoratorChanges();
|
|
190
|
+
changes.push(...uniqueIndexDecoratorChanges);
|
|
191
|
+
changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), this.getClassNode(this.modelName, source), source)); //FIXME: avoid this.modelName to passed in for avoiding statefullness
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
|
|
195
|
+
}
|
|
187
196
|
return {
|
|
188
197
|
filePath: source.fileName,
|
|
189
198
|
field: field,
|
|
@@ -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/dist/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.js
CHANGED
|
@@ -8,10 +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
15
|
class ManyToManyRelationFieldManagerForDto extends BaseFieldManagerForDto_1.BaseFieldManagerForDto {
|
|
16
16
|
isJson() {
|
|
17
17
|
return false;
|
|
@@ -147,10 +147,11 @@ class ManyToManyRelationFieldManagerForDto extends BaseFieldManagerForDto_1.Base
|
|
|
147
147
|
];
|
|
148
148
|
return this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source);
|
|
149
149
|
}
|
|
150
|
-
inverseFieldImport(modelName,
|
|
150
|
+
inverseFieldImport(modelName, currentModuleName, source) {
|
|
151
151
|
const inverseEntityImportName = `update-${(0, strings_1.dasherize)(modelName)}.dto`;
|
|
152
|
-
const
|
|
153
|
-
|
|
152
|
+
const modulePath = `src/${currentModuleName}`;
|
|
153
|
+
const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
|
|
154
|
+
return (0, FieldManager_1.safeInsertImport)(source, `Update${(0, strings_1.classify)(modelName)}Dto`, inverseEntityPath, currentModuleName);
|
|
154
155
|
}
|
|
155
156
|
addAdditionalInverseField() {
|
|
156
157
|
const fieldName = this.additionalFieldName();
|
|
@@ -358,7 +359,7 @@ class ManyToManyRelationFieldManagerForDto extends BaseFieldManagerForDto_1.Base
|
|
|
358
359
|
relatedFieldImport() {
|
|
359
360
|
const relatedEntityImportName = `update-${(0, strings_1.dasherize)(this.field.relationModelSingularName)}.dto`;
|
|
360
361
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
361
|
-
return (0, FieldManager_1.safeInsertImport)(this.source, `Update${(0, strings_1.classify)(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
362
|
+
return (0, FieldManager_1.safeInsertImport)(this.source, `Update${(0, strings_1.classify)(this.field.relationModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
|
|
362
363
|
// return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
|
|
363
364
|
} //Uncomment this method while implementing many-to-many relation changes
|
|
364
365
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManyToManyRelationFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ManyToManyRelationFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA6E;AAE7E,gIAAyH;AAEzH,8FAA2F;AAC3F,oGAAiG;AACjG,gGAA6F;AAC7F,sGAAmG;AACnG,qDAAoL;AACpL,2EAAwE;AAExE,MAAa,oCACT,SAAQ,+CAAsB;IAE9B,MAAM;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,SAAS;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;IAID,YAAY,IAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,KAAU,EAAE,OAA6B;QACpG,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,kCAAM,KAAK,KAAE,QAAQ,EAAE,KAAK,KAAG,OAAO,CAAC,CAAC;QACzE,IAAI,CAAC,iBAAiB,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAC,GAAG,IAAI,CAAC,yBAAyB,CACjF,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,EACX,4BAAa,CAAC,KAAK,EACnB,4BAAa,CAAC,cAAc,CAE/B,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,IAAI,CACvB,IAAI,qDAAyB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAC1J,CAAC;QAEF,wFAAwF;QACxF,IAAI,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACnC,MAAM,qBAAqB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,4BAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,SAAS,CAAC;YAC3N,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,SAAS,qBAAqB,EAAE,CAAC,CAAC,CAAC,OAAO,IAAA,mBAAS,EAAC,UAAU,CAAC,SAAS,qBAAqB,EAAE,CAAC;YACnN,IAAI,CAAC,qBAAqB,GAAG,IAAA,+BAAgB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACvE,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC,yBAAyB,CAClE,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,qBAAqB,EAC1B,4BAAa,CAAC,KAAK,EACnB,4BAAa,CAAC,cAAc,CAE7B,CAAC;YACJ,IAAI,CAAC,gCAAgC,CAAC,IAAI,CACtC,IAAI,qDAAyB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CACnJ,CAAC;YACF,IAAI,CAAC,gCAAgC,CAAC,IAAI,CACtC,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAC5H,CAAC;QAEN,CAAC;IACL,CAAC;IAED,QAAQ;QACJ,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,QAAQ;QACJ,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,KAAK;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,SAAS;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,YAAY;QACR,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,eAAe;QACX,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,WAAW;QACP,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,0DAA0D;IAC1D,SAAS;QACL,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;IACzE,CAAC;IAED,wHAAwH;IACxH,mBAAmB;QACf,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACnD,CAAC;IAEO,aAAa,CAAC,YAAoB;QACtC,OAAO,SAAS,IAAA,kBAAQ,EAAC,YAAY,CAAC,KAAK,CAAC;IAChD,CAAC;IAEO,mBAAmB,CAAC,YAAoB;QAC5C,wBAAwB;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAC7C,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,CAAA;QACxB,OAAO;YACH,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,CAAC,MAAW,EAAE,EAAE,CAClB,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC7D,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EACjC,SAAS,CACZ,CAAC;SACT,CAAC;IACN,CAAC;IAEQ,kBAAkB;QACvB,MAAM,YAAY,GAAkB,EAAE,CAAC;QAEvC,uCAAuC;QACvC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAChD,2CAA2C;QAC3C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;QAEpD,8CAA8C;QAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACnC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC;YACpD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;YACvD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,iCAAiC,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,4BAA4B;QAChC,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAC;QAC5D,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,MAAM,GAAE,IAAI,CAAC,qBAAqB,CAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAA;QACtD,MAAM,iBAAiB,GAAG;YACtB,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,IAAI,6CAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAC7E,CAAA;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACpG,CAAC;IAEO,iCAAiC;QACrC,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,SAAS,CAAC;QAChE,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,MAAM,GAAE,IAAI,CAAC,qBAAqB,CAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAA;QACtD,MAAM,iBAAiB,GAAG;YACtB,IAAI,+CAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC5E,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,+CAA+C;SAClD,CAAA;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACpG,CAAC;IAEO,qBAAqB;QACzB,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;QAC1C,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,MAAM,GAAE,IAAI,CAAC,MAAM,CAAA;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,MAAM,iBAAiB,GAAG;YACtB,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,IAAI,6CAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAC7E,CAAA;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACpG,CAAC;IAEO,yBAAyB;QAC7B,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;QAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,MAAM,GAAE,IAAI,CAAC,MAAM,CAAA;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,MAAM,iBAAiB,GAAG;YACtB,IAAI,+CAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC5E,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,+CAA+C;SAClD,CAAA;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEpG,CAAC;IAEO,kBAAkB,CAAC,SAAiB,EAAE,iBAAyB,EAAE,MAAqB;QAC1F,MAAM,uBAAuB,GAAG,UAAU,IAAA,mBAAS,EAAC,SAAS,CAAC,MAAM,CAAC;QACrE,MAAM,UAAU,GAAG,OAAO,iBAAiB,EAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,GAAG,UAAU,SAAS,uBAAuB,EAAE,CAAC;QAC1E,OAAO,IAAA,+BAAgB,EAAC,MAAM,EAAE,SAAS,IAAA,kBAAQ,EAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IAC7G,CAAC;IAEO,yBAAyB;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC;QAClD,MAAM,MAAM,GAAE,IAAI,CAAC,qBAAqB,CAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAA;QACtD,MAAM,iBAAiB,GAAG,IAAI,CAAC,gCAAgC,CAAA;QAC/D,MAAM,WAAW,GAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC9G,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;YAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;YACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC;YAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;QACnG,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,+CAA+C;IACtC,0BAA0B;QAC/B,MAAM,YAAY,GAAkB,EAAE,CAAC;QAEvC,8BAA8B;QAC9B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACnD,kCAAkC;QAClC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACnC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;YACvD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE,CAAC,CAAC;YAC1D,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,4BAA4B;;QACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;QAC3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnF,MAAM,MAAM,GAAE,IAAI,CAAC,qBAAqB,CAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,wBAAwB,GAAG,IAAI,CAAC,gCAAgC,CAAA;QAEtE,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,sBAAsB,CACzC,gBAAgB,EAChB,MAAM,CACV,0CAAE,MAA6B,CAAC;QACjC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC7C,CAAC;aACI,CAAC;YACC,0BAA0B;YAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YACzH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;gBAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;gBACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC;gBAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;YACnG,CAAC;YACD,OAAO,WAAW,CAAC;QAC1B,CAAC;IACN,CAAC;IAED,+BAA+B;;QAC3B,MAAM,YAAY,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAA;QAC9D,MAAM,YAAY,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;QACnH,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,iBAAiB,GAAG;YACtB,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,IAAI,6CAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;SAC7E,CAAA;QAED,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,sBAAsB,CACxC,YAAY,EACZ,MAAM,CACT,0CAAE,MAA6B,CAAC;QACjC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAC/C,CAAC;aACI,CAAC;YACF,sBAAsB;YACtB,OAAO,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACjG,CAAC;IACL,CAAC;IAED,oCAAoC;;QAChC,MAAM,gBAAgB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,SAAS,CAAA;QACtE,MAAM,gBAAgB,GAAG,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,MAAM,iBAAiB,GAAG;YACtB,IAAI,+CAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC5E,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACrG,+CAA+C;SAClD,CAAA;QAED,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,sBAAsB,CAC5C,gBAAgB,EAChB,MAAM,CACT,0CAAE,MAA6B,CAAC;QACjC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,iCAAiC,EAAE,CAAC;QACpD,CAAC;aACI,CAAC;YACF,0BAA0B;YAC1B,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;QACzG,CAAC;IACL,CAAC;IAEO,wBAAwB;;QAC5B,MAAM,YAAY,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QAExB,2CAA2C;QAC3C,8BAA8B;QAC9B,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,sBAAsB,CACxC,YAAY,EACZ,MAAM,CACT,0CAAE,MAA6B,CAAC;QACjC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxC,CAAC;aACI,CAAC;YACF,sBAAsB;YACtB,MAAM,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;YAChH,MAAM,iBAAiB,GAAG;gBACtB,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBACrG,IAAI,6CAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAC7E,CAAC;YACF,OAAO,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/F,CAAC;IAEL,CAAC;IAED,4BAA4B;;QACxB,MAAM,gBAAgB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAA;QACpD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QAExB,2CAA2C;QAC3C,kCAAkC;QAClC,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,sBAAsB,CAC5C,gBAAgB,EAChB,MAAM,CACT,0CAAE,MAA6B,CAAC;QACjC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC5C,CAAC;aACI,CAAC;YACF,0BAA0B;YAC1B,MAAM,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAChF,MAAM,iBAAiB,GAAG;gBACtB,IAAI,+CAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAC5E,IAAI,mDAAwB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBACrG,+CAA+C;aAClD,CAAC;YACF,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACnG,CAAC;IACL,CAAC;IAEQ,qBAAqB;QAC1B,MAAM,YAAY,GAAkB,EAAE,CAAC;QAEvC,uCAAuC;QACvC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACnD,2CAA2C;QAC3C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;QAEvD,8CAA8C;QAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACnC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;YACvD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE,CAAC,CAAC;YAC1D,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,wBAAwB;QACpB,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,4BAA4B;QACxB,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,4BAA4B;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAC1C,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,+BAA+B;QAC3B,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAC;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAC1C,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IACD,oCAAoC;QAChC,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,SAAS,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAC1C,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,mGAAmG;IAC1F,SAAS;QACd,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;IAC7C,CAAC;IAES,yBAAyB;QAC/B,OAAO,IAAI,CAAA;QACX,2CAA2C;IAC/C,CAAC;IAEQ,QAAQ;QACb,MAAM,YAAY,GAAkB,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACrF,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEQ,WAAW;QAChB,MAAM,YAAY,GAAkB,KAAK,CAAC,WAAW,EAAE,CAAC;QAExD,gGAAgG;QAChG,sGAAsG;QACtG,oDAAoD;QAEpD,mEAAmE;QACnE,4FAA4F;QACxF,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACtD,IAAI;QACJ,OAAO,YAAY,CAAA;IACvB,CAAC;IAED,kBAAkB;QACd,MAAM,uBAAuB,GAAG,UAAU,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC;QAChG,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,uBAAuB,SAAS,uBAAuB,EAAE,CAAC,CAAC,CAAC,KAAK,uBAAuB,EAAE,CAAC;QAC5K,OAAO,IAAA,+BAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,SAAS,IAAA,kBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvI,2IAA2I;IAC/I,CAAC,CAAC,wEAAwE;CAC7E;AAlbD,oFAkbC"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ManyToManyRelationFieldManagerForEntity = 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 ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
10
9
|
const ManyToManyDecoratorManager_1 = require("../../decorator-managers/entity/ManyToManyDecoratorManager");
|
|
11
10
|
const FieldManager_1 = require("../../FieldManager");
|
|
12
11
|
const BaseFieldManagerForEntity_1 = require("../base/BaseFieldManagerForEntity");
|
|
@@ -64,7 +63,7 @@ class ManyToManyRelationFieldManagerForEntity extends BaseFieldManagerForEntity_
|
|
|
64
63
|
relatedFieldImport() {
|
|
65
64
|
const relatedEntityImportName = `${(0, strings_1.dasherize)(this.field.relationModelSingularName)}.entity`;
|
|
66
65
|
const relatedEntityPath = this.field.relationModelModuleName ? `src/${(0, strings_1.dasherize)(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
|
|
67
|
-
return (0,
|
|
66
|
+
return (0, FieldManager_1.safeInsertImport)(this.source, (0, strings_1.classify)(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
|
|
68
67
|
}
|
|
69
68
|
removeAdditionalField() {
|
|
70
69
|
const changes = [];
|
|
@@ -103,10 +102,11 @@ class ManyToManyRelationFieldManagerForEntity extends BaseFieldManagerForEntity_
|
|
|
103
102
|
}
|
|
104
103
|
return fieldChange;
|
|
105
104
|
}
|
|
106
|
-
inverseFieldImport(modelName,
|
|
105
|
+
inverseFieldImport(modelName, currentModuleName, source) {
|
|
107
106
|
const inverseEntityImportName = `${(0, strings_1.dasherize)(modelName)}.entity`;
|
|
108
|
-
const
|
|
109
|
-
|
|
107
|
+
const modulePath = `src/${currentModuleName}`;
|
|
108
|
+
const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
|
|
109
|
+
return (0, FieldManager_1.safeInsertImport)(source, `${(0, strings_1.classify)(modelName)}`, inverseEntityPath, currentModuleName);
|
|
110
110
|
}
|
|
111
111
|
addOrUpdateAdditionalField() {
|
|
112
112
|
const fieldChanges = [];
|