@carlonicora/nestjs-neo4jsonapi 1.9.0 → 1.10.0
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/common/helpers/define-entity.d.ts.map +1 -1
- package/dist/common/helpers/define-entity.js +24 -3
- package/dist/common/helpers/define-entity.js.map +1 -1
- package/dist/common/interfaces/entity.schema.interface.d.ts +16 -0
- package/dist/common/interfaces/entity.schema.interface.d.ts.map +1 -1
- package/dist/core/jsonapi/interfaces/jsonapi.data.interface.d.ts +3 -0
- package/dist/core/jsonapi/interfaces/jsonapi.data.interface.d.ts.map +1 -1
- package/dist/core/jsonapi/serialisers/descriptor.based.serialiser.d.ts.map +1 -1
- package/dist/core/jsonapi/serialisers/descriptor.based.serialiser.js +8 -0
- package/dist/core/jsonapi/serialisers/descriptor.based.serialiser.js.map +1 -1
- package/dist/core/jsonapi/services/jsonapi.service.d.ts.map +1 -1
- package/dist/core/jsonapi/services/jsonapi.service.js +12 -0
- package/dist/core/jsonapi/services/jsonapi.service.js.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.d.ts +2 -0
- package/dist/core/neo4j/abstracts/abstract.repository.d.ts.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.js +59 -2
- package/dist/core/neo4j/abstracts/abstract.repository.js.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.service.d.ts +1 -0
- package/dist/core/neo4j/abstracts/abstract.service.d.ts.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.service.js +22 -2
- package/dist/core/neo4j/abstracts/abstract.service.js.map +1 -1
- package/dist/scripts/generate-module/templates/controller.template.d.ts.map +1 -1
- package/dist/scripts/generate-module/templates/controller.template.js +10 -9
- package/dist/scripts/generate-module/templates/controller.template.js.map +1 -1
- package/dist/scripts/generate-module/templates/dto.base.template.js +2 -2
- package/dist/scripts/generate-module/templates/dto.base.template.js.map +1 -1
- package/dist/scripts/generate-module/templates/dto.post.template.d.ts.map +1 -1
- package/dist/scripts/generate-module/templates/dto.post.template.js +81 -17
- package/dist/scripts/generate-module/templates/dto.post.template.js.map +1 -1
- package/dist/scripts/generate-module/templates/dto.put.template.d.ts.map +1 -1
- package/dist/scripts/generate-module/templates/dto.put.template.js +81 -17
- package/dist/scripts/generate-module/templates/dto.put.template.js.map +1 -1
- package/dist/scripts/generate-module/templates/entity.template.d.ts.map +1 -1
- package/dist/scripts/generate-module/templates/entity.template.js +7 -1
- package/dist/scripts/generate-module/templates/entity.template.js.map +1 -1
- package/dist/scripts/generate-module/transformers/relationship-mapper.d.ts.map +1 -1
- package/dist/scripts/generate-module/transformers/relationship-mapper.js +23 -0
- package/dist/scripts/generate-module/transformers/relationship-mapper.js.map +1 -1
- package/dist/scripts/generate-module/types/json-schema.interface.d.ts +2 -0
- package/dist/scripts/generate-module/types/json-schema.interface.d.ts.map +1 -1
- package/dist/scripts/generate-module/types/template-data.interface.d.ts +1 -0
- package/dist/scripts/generate-module/types/template-data.interface.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.service.js","sourceRoot":"","sources":["../../../../src/core/neo4j/abstracts/abstract.service.ts"],"names":[],"mappings":";;;AAAA,2CAAuE;AAKvE,mFAA+E;
|
|
1
|
+
{"version":3,"file":"abstract.service.js","sourceRoot":"","sources":["../../../../src/core/neo4j/abstracts/abstract.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/controller.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"controller.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/controller.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA6MjE"}
|
|
@@ -106,6 +106,7 @@ import {
|
|
|
106
106
|
import { ${names.pascalCase}PostDTO } from "src/${targetDir}/${names.kebabCase}/dtos/${names.kebabCase}.post.dto";
|
|
107
107
|
import { ${names.pascalCase}PutDTO } from "src/${targetDir}/${names.kebabCase}/dtos/${names.kebabCase}.put.dto";
|
|
108
108
|
import { ${names.pascalCase}Descriptor } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}";
|
|
109
|
+
import { ${names.camelCase}Meta } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}.meta";
|
|
109
110
|
import { ${names.pascalCase}Service } from "src/${targetDir}/${names.kebabCase}/services/${names.kebabCase}.service";
|
|
110
111
|
|
|
111
112
|
@UseGuards(JwtAuthGuard)
|
|
@@ -117,7 +118,7 @@ export class ${names.pascalCase}Controller {
|
|
|
117
118
|
private readonly auditService: AuditService,
|
|
118
119
|
) {}
|
|
119
120
|
|
|
120
|
-
@Get(${names.
|
|
121
|
+
@Get(${names.camelCase}Meta.endpoint)
|
|
121
122
|
async findAll(
|
|
122
123
|
@Req() req: AuthenticatedRequest,
|
|
123
124
|
@Res() reply: FastifyReply,
|
|
@@ -136,7 +137,7 @@ export class ${names.pascalCase}Controller {
|
|
|
136
137
|
reply.send(response);
|
|
137
138
|
}
|
|
138
139
|
|
|
139
|
-
@Get(\`\${${names.
|
|
140
|
+
@Get(\`\${${names.camelCase}Meta.endpoint}/:${names.camelCase}Id\`)
|
|
140
141
|
async findById(
|
|
141
142
|
@Req() req: AuthenticatedRequest,
|
|
142
143
|
@Res() reply: FastifyReply,
|
|
@@ -149,12 +150,12 @@ export class ${names.pascalCase}Controller {
|
|
|
149
150
|
reply.send(response);
|
|
150
151
|
|
|
151
152
|
this.auditService.createAuditEntry({
|
|
152
|
-
entityType: ${names.
|
|
153
|
+
entityType: ${names.camelCase}Meta.labelName,
|
|
153
154
|
entityId: ${names.camelCase}Id,
|
|
154
155
|
});
|
|
155
156
|
}
|
|
156
157
|
|
|
157
|
-
@Post(${names.
|
|
158
|
+
@Post(${names.camelCase}Meta.endpoint)
|
|
158
159
|
async create(
|
|
159
160
|
@Req() req: AuthenticatedRequest,
|
|
160
161
|
@Res() reply: FastifyReply,
|
|
@@ -166,10 +167,10 @@ export class ${names.pascalCase}Controller {
|
|
|
166
167
|
|
|
167
168
|
reply.send(response);
|
|
168
169
|
|
|
169
|
-
await this.cacheService.invalidateByType(${names.
|
|
170
|
+
await this.cacheService.invalidateByType(${names.camelCase}Meta.endpoint);
|
|
170
171
|
}
|
|
171
172
|
|
|
172
|
-
@Put(\`\${${names.
|
|
173
|
+
@Put(\`\${${names.camelCase}Meta.endpoint}/:${names.camelCase}Id\`)
|
|
173
174
|
async update(
|
|
174
175
|
@Req() req: AuthenticatedRequest,
|
|
175
176
|
@Res() reply: FastifyReply,
|
|
@@ -185,10 +186,10 @@ export class ${names.pascalCase}Controller {
|
|
|
185
186
|
|
|
186
187
|
reply.send(response);
|
|
187
188
|
|
|
188
|
-
await this.cacheService.invalidateByElement(${names.
|
|
189
|
+
await this.cacheService.invalidateByElement(${names.camelCase}Meta.endpoint, body.data.id);
|
|
189
190
|
}
|
|
190
191
|
|
|
191
|
-
@Delete(\`\${${names.
|
|
192
|
+
@Delete(\`\${${names.camelCase}Meta.endpoint}/:${names.camelCase}Id\`)
|
|
192
193
|
@HttpCode(HttpStatus.NO_CONTENT)
|
|
193
194
|
async delete(
|
|
194
195
|
@Req() req: AuthenticatedRequest,
|
|
@@ -198,7 +199,7 @@ export class ${names.pascalCase}Controller {
|
|
|
198
199
|
await this.${names.camelCase}Service.delete({ id: ${names.camelCase}Id });
|
|
199
200
|
reply.send();
|
|
200
201
|
|
|
201
|
-
await this.cacheService.invalidateByElement(${names.
|
|
202
|
+
await this.cacheService.invalidateByElement(${names.camelCase}Meta.endpoint, ${names.camelCase}Id);
|
|
202
203
|
}
|
|
203
204
|
${nestedRouteMethods}
|
|
204
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/controller.template.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"controller.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/controller.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ function generateBaseDTOFile(data) {
|
|
|
11
11
|
const { names, targetDir } = data;
|
|
12
12
|
return `import { Type } from "class-transformer";
|
|
13
13
|
import { Equals, IsNotEmpty, IsUUID, ValidateNested } from "class-validator";
|
|
14
|
-
import { ${names.
|
|
14
|
+
import { ${names.camelCase}Meta } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}.meta";
|
|
15
15
|
|
|
16
16
|
export class ${names.pascalCase}DTO {
|
|
17
|
-
@Equals(${names.
|
|
17
|
+
@Equals(${names.camelCase}Meta.endpoint)
|
|
18
18
|
type: string;
|
|
19
19
|
|
|
20
20
|
@IsUUID()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.base.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.base.template.ts"],"names":[],"mappings":";;AAQA,kDA6BC;AAnCD;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAAkB;IACpD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAElC,OAAO;;WAEE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"dto.base.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.base.template.ts"],"names":[],"mappings":";;AAQA,kDA6BC;AAnCD;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAAkB;IACpD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAElC,OAAO;;WAEE,KAAK,CAAC,SAAS,oBAAoB,SAAS,IAAI,KAAK,CAAC,SAAS,aAAa,KAAK,CAAC,SAAS;;eAEvF,KAAK,CAAC,UAAU;YACnB,KAAK,CAAC,SAAS;;;;;;;eAOZ,KAAK,CAAC,UAAU;;;gBAGf,KAAK,CAAC,UAAU;UACtB,KAAK,CAAC,UAAU;;;eAGX,KAAK,CAAC,UAAU;;;gBAGf,KAAK,CAAC,UAAU;UACtB,KAAK,CAAC,UAAU;;CAEzB,CAAC;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.post.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.post.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"dto.post.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.post.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;AA4BxF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAgL9D"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generatePostDTOFile = generatePostDTOFile;
|
|
4
4
|
const import_resolver_1 = require("../transformers/import-resolver");
|
|
5
5
|
const type_utils_1 = require("../utils/type-utils");
|
|
6
|
+
const name_transformer_1 = require("../transformers/name-transformer");
|
|
6
7
|
/**
|
|
7
8
|
* Get the import path for a relationship's DTO
|
|
8
9
|
*/
|
|
@@ -55,7 +56,7 @@ function generatePostDTOFile(data) {
|
|
|
55
56
|
.map(([path, items]) => `import { ${Array.from(items).join(", ")} } from "${path}";`)
|
|
56
57
|
.join("\n")}\n`
|
|
57
58
|
: "";
|
|
58
|
-
// Build attribute validation using
|
|
59
|
+
// Build attribute validation using ONLY regular fields (not relationship property fields)
|
|
59
60
|
const attributeFields = dtoFields
|
|
60
61
|
.map((field) => {
|
|
61
62
|
const optional = field.isOptional ? "?" : "";
|
|
@@ -63,35 +64,98 @@ function generatePostDTOFile(data) {
|
|
|
63
64
|
})
|
|
64
65
|
.join("\n\n");
|
|
65
66
|
// Get dynamic validator imports based on field types
|
|
66
|
-
|
|
67
|
+
// Include relationship property field types for generating meta DTOs
|
|
68
|
+
const relPropertyTypes = [];
|
|
69
|
+
for (const rel of relationships) {
|
|
70
|
+
if (rel.fields && rel.fields.length > 0 && !rel.contextKey && rel.cardinality === "one") {
|
|
71
|
+
for (const field of rel.fields) {
|
|
72
|
+
relPropertyTypes.push(field.type);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
const fieldTypes = [...fields.map((f) => f.type), ...relPropertyTypes];
|
|
67
77
|
const validatorImports = (0, type_utils_1.getValidationImports)(fieldTypes);
|
|
78
|
+
// Generate meta DTOs for relationships with fields
|
|
79
|
+
const metaDtoClasses = [];
|
|
80
|
+
for (const rel of relationships) {
|
|
81
|
+
if (rel.fields && rel.fields.length > 0 && !rel.contextKey && rel.cardinality === "one") {
|
|
82
|
+
const dtoKey = rel.dtoKey || rel.key;
|
|
83
|
+
const metaDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}MetaDTO`;
|
|
84
|
+
const wrapperDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}RelationshipDTO`;
|
|
85
|
+
// Generate meta DTO with relationship property fields
|
|
86
|
+
const metaFields = rel.fields
|
|
87
|
+
.map((field) => {
|
|
88
|
+
const fieldType = field.type;
|
|
89
|
+
const decorators = (0, type_utils_1.getValidationDecorators)(fieldType, field.required);
|
|
90
|
+
const optional = !field.required ? "?" : "";
|
|
91
|
+
return ` ${decorators.join("\n ")}\n ${field.name}${optional}: ${field.tsType};`;
|
|
92
|
+
})
|
|
93
|
+
.join("\n\n");
|
|
94
|
+
metaDtoClasses.push(`
|
|
95
|
+
export class ${metaDtoName} {
|
|
96
|
+
${metaFields}
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
export class ${wrapperDtoName} {
|
|
100
|
+
@ValidateNested()
|
|
101
|
+
@IsDefined()
|
|
102
|
+
@Type(() => ${rel.relatedEntity.name}DataDTO)
|
|
103
|
+
data: ${rel.relatedEntity.name}DataDTO;
|
|
104
|
+
|
|
105
|
+
@ValidateNested()
|
|
106
|
+
@IsOptional()
|
|
107
|
+
@Type(() => ${metaDtoName})
|
|
108
|
+
meta?: ${metaDtoName};
|
|
109
|
+
}`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
68
112
|
// Build relationship validation (exclude contextKey)
|
|
69
113
|
const relationshipFields = relationships
|
|
70
114
|
.filter((rel) => !rel.contextKey) // Exclude Author and other contextKey relationships
|
|
71
115
|
.map((rel) => {
|
|
72
116
|
const decorators = [];
|
|
73
|
-
const
|
|
74
|
-
if
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
117
|
+
const dtoKey = rel.dtoKey || rel.key;
|
|
118
|
+
// Check if this relationship has fields - if so, use the wrapper DTO
|
|
119
|
+
const hasFields = rel.fields && rel.fields.length > 0 && rel.cardinality === "one";
|
|
120
|
+
if (hasFields) {
|
|
121
|
+
// Use wrapper DTO with meta support
|
|
122
|
+
const wrapperDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}RelationshipDTO`;
|
|
78
123
|
decorators.push("@ValidateNested()");
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
124
|
+
if (rel.nullable) {
|
|
125
|
+
decorators.push("@IsOptional()");
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
decorators.push("@IsDefined()");
|
|
129
|
+
}
|
|
130
|
+
decorators.push(`@Type(() => ${wrapperDtoName})`);
|
|
131
|
+
const optional = rel.nullable ? "?" : "";
|
|
132
|
+
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${wrapperDtoName};`;
|
|
82
133
|
}
|
|
83
134
|
else {
|
|
84
|
-
|
|
135
|
+
// Regular relationship without fields
|
|
136
|
+
const dtoClass = rel.cardinality === "many" ? `${rel.relatedEntity.name}DataListDTO` : `${rel.relatedEntity.name}DataDTO`;
|
|
137
|
+
if (rel.cardinality === "many") {
|
|
138
|
+
decorators.push("@ValidateNested({ each: true })");
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
decorators.push("@ValidateNested()");
|
|
142
|
+
}
|
|
143
|
+
if (rel.nullable) {
|
|
144
|
+
decorators.push("@IsOptional()");
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
decorators.push("@IsDefined()");
|
|
148
|
+
}
|
|
149
|
+
decorators.push(`@Type(() => ${dtoClass})`);
|
|
150
|
+
const optional = rel.nullable ? "?" : "";
|
|
151
|
+
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${dtoClass};`;
|
|
85
152
|
}
|
|
86
|
-
decorators.push(`@Type(() => ${dtoClass})`);
|
|
87
|
-
const optional = rel.nullable ? "?" : "";
|
|
88
|
-
const dtoKey = rel.dtoKey || rel.key;
|
|
89
|
-
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${dtoClass};`;
|
|
90
153
|
})
|
|
91
154
|
.join("\n\n");
|
|
92
155
|
return `import { Type } from "class-transformer";
|
|
93
156
|
import { ${validatorImports.join(", ")} } from "class-validator";${dtoImportsCode}
|
|
94
|
-
import { ${names.
|
|
157
|
+
import { ${names.camelCase}Meta } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}.meta";
|
|
158
|
+
${metaDtoClasses.join("\n")}
|
|
95
159
|
|
|
96
160
|
export class ${names.pascalCase}PostAttributesDTO {
|
|
97
161
|
${attributeFields}
|
|
@@ -102,7 +166,7 @@ ${relationshipFields || " // No relationships (excluding contextKey relationshi
|
|
|
102
166
|
}
|
|
103
167
|
|
|
104
168
|
export class ${names.pascalCase}PostDataDTO {
|
|
105
|
-
@Equals(${names.
|
|
169
|
+
@Equals(${names.camelCase}Meta.endpoint)
|
|
106
170
|
type: string;
|
|
107
171
|
|
|
108
172
|
@IsUUID()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.post.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.post.template.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"dto.post.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.post.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.put.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.put.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"dto.put.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.put.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;AA4BxF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAgL7D"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.generatePutDTOFile = generatePutDTOFile;
|
|
4
4
|
const import_resolver_1 = require("../transformers/import-resolver");
|
|
5
5
|
const type_utils_1 = require("../utils/type-utils");
|
|
6
|
+
const name_transformer_1 = require("../transformers/name-transformer");
|
|
6
7
|
/**
|
|
7
8
|
* Get the import path for a relationship's DTO
|
|
8
9
|
*/
|
|
@@ -56,7 +57,7 @@ function generatePutDTOFile(data) {
|
|
|
56
57
|
.map(([path, items]) => `import { ${Array.from(items).join(", ")} } from "${path}";`)
|
|
57
58
|
.join("\n")}\n`
|
|
58
59
|
: "";
|
|
59
|
-
// Build attribute validation using
|
|
60
|
+
// Build attribute validation using ONLY regular fields (not relationship property fields)
|
|
60
61
|
const attributeFields = dtoFields
|
|
61
62
|
.map((field) => {
|
|
62
63
|
const optional = field.isOptional ? "?" : "";
|
|
@@ -64,35 +65,98 @@ function generatePutDTOFile(data) {
|
|
|
64
65
|
})
|
|
65
66
|
.join("\n\n");
|
|
66
67
|
// Get dynamic validator imports based on field types
|
|
67
|
-
|
|
68
|
+
// Include relationship property field types for generating meta DTOs
|
|
69
|
+
const relPropertyTypes = [];
|
|
70
|
+
for (const rel of relationships) {
|
|
71
|
+
if (rel.fields && rel.fields.length > 0 && !rel.contextKey && rel.cardinality === "one") {
|
|
72
|
+
for (const field of rel.fields) {
|
|
73
|
+
relPropertyTypes.push(field.type);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const fieldTypes = [...fields.map((f) => f.type), ...relPropertyTypes];
|
|
68
78
|
const validatorImports = (0, type_utils_1.getValidationImports)(fieldTypes);
|
|
79
|
+
// Generate meta DTOs for relationships with fields
|
|
80
|
+
const metaDtoClasses = [];
|
|
81
|
+
for (const rel of relationships) {
|
|
82
|
+
if (rel.fields && rel.fields.length > 0 && !rel.contextKey && rel.cardinality === "one") {
|
|
83
|
+
const dtoKey = rel.dtoKey || rel.key;
|
|
84
|
+
const metaDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}MetaDTO`;
|
|
85
|
+
const wrapperDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}RelationshipDTO`;
|
|
86
|
+
// Generate meta DTO with relationship property fields
|
|
87
|
+
const metaFields = rel.fields
|
|
88
|
+
.map((field) => {
|
|
89
|
+
const fieldType = field.type;
|
|
90
|
+
const decorators = (0, type_utils_1.getValidationDecorators)(fieldType, field.required);
|
|
91
|
+
const optional = !field.required ? "?" : "";
|
|
92
|
+
return ` ${decorators.join("\n ")}\n ${field.name}${optional}: ${field.tsType};`;
|
|
93
|
+
})
|
|
94
|
+
.join("\n\n");
|
|
95
|
+
metaDtoClasses.push(`
|
|
96
|
+
export class ${metaDtoName} {
|
|
97
|
+
${metaFields}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
export class ${wrapperDtoName} {
|
|
101
|
+
@ValidateNested()
|
|
102
|
+
@IsDefined()
|
|
103
|
+
@Type(() => ${rel.relatedEntity.name}DataDTO)
|
|
104
|
+
data: ${rel.relatedEntity.name}DataDTO;
|
|
105
|
+
|
|
106
|
+
@ValidateNested()
|
|
107
|
+
@IsOptional()
|
|
108
|
+
@Type(() => ${metaDtoName})
|
|
109
|
+
meta?: ${metaDtoName};
|
|
110
|
+
}`);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
69
113
|
// Build relationship validation (exclude contextKey - same as POST)
|
|
70
114
|
const relationshipFields = relationships
|
|
71
115
|
.filter((rel) => !rel.contextKey) // Exclude Author and other contextKey relationships
|
|
72
116
|
.map((rel) => {
|
|
73
117
|
const decorators = [];
|
|
74
|
-
const
|
|
75
|
-
if
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
118
|
+
const dtoKey = rel.dtoKey || rel.key;
|
|
119
|
+
// Check if this relationship has fields - if so, use the wrapper DTO
|
|
120
|
+
const hasFields = rel.fields && rel.fields.length > 0 && rel.cardinality === "one";
|
|
121
|
+
if (hasFields) {
|
|
122
|
+
// Use wrapper DTO with meta support
|
|
123
|
+
const wrapperDtoName = `${names.pascalCase}${(0, name_transformer_1.toPascalCase)(dtoKey)}RelationshipDTO`;
|
|
79
124
|
decorators.push("@ValidateNested()");
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
125
|
+
if (rel.nullable) {
|
|
126
|
+
decorators.push("@IsOptional()");
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
decorators.push("@IsDefined()");
|
|
130
|
+
}
|
|
131
|
+
decorators.push(`@Type(() => ${wrapperDtoName})`);
|
|
132
|
+
const optional = rel.nullable ? "?" : "";
|
|
133
|
+
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${wrapperDtoName};`;
|
|
83
134
|
}
|
|
84
135
|
else {
|
|
85
|
-
|
|
136
|
+
// Regular relationship without fields
|
|
137
|
+
const dtoClass = rel.cardinality === "many" ? `${rel.relatedEntity.name}DataListDTO` : `${rel.relatedEntity.name}DataDTO`;
|
|
138
|
+
if (rel.cardinality === "many") {
|
|
139
|
+
decorators.push("@ValidateNested({ each: true })");
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
decorators.push("@ValidateNested()");
|
|
143
|
+
}
|
|
144
|
+
if (rel.nullable) {
|
|
145
|
+
decorators.push("@IsOptional()");
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
decorators.push("@IsDefined()");
|
|
149
|
+
}
|
|
150
|
+
decorators.push(`@Type(() => ${dtoClass})`);
|
|
151
|
+
const optional = rel.nullable ? "?" : "";
|
|
152
|
+
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${dtoClass};`;
|
|
86
153
|
}
|
|
87
|
-
decorators.push(`@Type(() => ${dtoClass})`);
|
|
88
|
-
const optional = rel.nullable ? "?" : "";
|
|
89
|
-
const dtoKey = rel.dtoKey || rel.key;
|
|
90
|
-
return ` ${decorators.join("\n ")}\n ${dtoKey}${optional}: ${dtoClass};`;
|
|
91
154
|
})
|
|
92
155
|
.join("\n\n");
|
|
93
156
|
return `import { Type } from "class-transformer";
|
|
94
157
|
import { ${validatorImports.join(", ")} } from "class-validator";${dtoImportsCode}
|
|
95
|
-
import { ${names.
|
|
158
|
+
import { ${names.camelCase}Meta } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}.meta";
|
|
159
|
+
${metaDtoClasses.join("\n")}
|
|
96
160
|
|
|
97
161
|
export class ${names.pascalCase}PutAttributesDTO {
|
|
98
162
|
${attributeFields}
|
|
@@ -103,7 +167,7 @@ ${relationshipFields || " // No relationships (excluding contextKey relationshi
|
|
|
103
167
|
}
|
|
104
168
|
|
|
105
169
|
export class ${names.pascalCase}PutDataDTO {
|
|
106
|
-
@Equals(${names.
|
|
170
|
+
@Equals(${names.camelCase}Meta.endpoint)
|
|
107
171
|
type: string;
|
|
108
172
|
|
|
109
173
|
@IsUUID()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.put.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.put.template.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"dto.put.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/dto.put.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;AA2BxF;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"entity.template.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0B,MAAM,kCAAkC,CAAC;AA2BxF;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA6I7D"}
|
|
@@ -93,6 +93,13 @@ function generateEntityFile(data) {
|
|
|
93
93
|
if (rel.dtoKey) {
|
|
94
94
|
parts.push(`dtoKey: "${rel.dtoKey}"`);
|
|
95
95
|
}
|
|
96
|
+
// Add relationship property fields if present
|
|
97
|
+
if (rel.fields && rel.fields.length > 0) {
|
|
98
|
+
const fieldsDef = rel.fields
|
|
99
|
+
.map((f) => `{ name: "${f.name}", type: "${f.type}", required: ${f.required} }`)
|
|
100
|
+
.join(", ");
|
|
101
|
+
parts.push(`fields: [${fieldsDef}]`);
|
|
102
|
+
}
|
|
96
103
|
return ` ${rel.key}: {\n ${parts.join(",\n ")},\n },`;
|
|
97
104
|
})
|
|
98
105
|
.join("\n");
|
|
@@ -120,7 +127,6 @@ ${fields
|
|
|
120
127
|
return ` ${field.name}${optional}: ${field.tsType};`;
|
|
121
128
|
})
|
|
122
129
|
.join("\n")}
|
|
123
|
-
|
|
124
130
|
${data.isCompanyScoped ? " company: Company;\n" : ""}${relationships
|
|
125
131
|
.map((rel) => {
|
|
126
132
|
const optional = rel.nullable ? "?" : "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"entity.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship-mapper.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/transformers/relationship-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"relationship-mapper.d.ts","sourceRoot":"","sources":["../../../../scripts/generate-module/transformers/relationship-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAiB,MAAM,kCAAkC,CAAC;AAUzF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,0BAA0B,GAAG,sBAAsB,CAkGvF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,0BAA0B,EAAE,GAAG,sBAAsB,EAAE,CAEtG;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,sBAAsB,EAAE,GAAG,MAAM,EAAE,CAGtF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,sBAAsB,EAAE,GAAG,MAAM,EAAE,CAGxF"}
|
|
@@ -6,6 +6,7 @@ exports.getUniqueMetaImports = getUniqueMetaImports;
|
|
|
6
6
|
exports.getUniqueEntityImports = getUniqueEntityImports;
|
|
7
7
|
const name_transformer_1 = require("./name-transformer");
|
|
8
8
|
const import_resolver_1 = require("./import-resolver");
|
|
9
|
+
const type_utils_1 = require("../utils/type-utils");
|
|
9
10
|
/**
|
|
10
11
|
* Map JSON relationship definition to descriptor relationship
|
|
11
12
|
*
|
|
@@ -64,6 +65,27 @@ function mapRelationship(rel) {
|
|
|
64
65
|
moduleName: relatedEntityNames.kebabCase,
|
|
65
66
|
})
|
|
66
67
|
: undefined;
|
|
68
|
+
// Process relationship property fields (only supported for cardinality: "one")
|
|
69
|
+
let fields;
|
|
70
|
+
if (rel.fields && rel.fields.length > 0) {
|
|
71
|
+
if (!rel.single) {
|
|
72
|
+
throw new Error(`Relationship "${rel.name}" has fields but is not single (cardinality: one). ` +
|
|
73
|
+
`Relationship properties are only supported for single relationships.`);
|
|
74
|
+
}
|
|
75
|
+
fields = rel.fields.map((field) => {
|
|
76
|
+
const normalizedType = (0, type_utils_1.normalizeCypherType)(field.type);
|
|
77
|
+
if (!normalizedType) {
|
|
78
|
+
throw new Error(`Invalid field type "${field.type}" for relationship field "${field.name}" ` +
|
|
79
|
+
`on relationship "${rel.name}".`);
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
name: field.name,
|
|
83
|
+
type: normalizedType,
|
|
84
|
+
required: !field.nullable,
|
|
85
|
+
tsType: (0, type_utils_1.getTsType)(normalizedType),
|
|
86
|
+
};
|
|
87
|
+
});
|
|
88
|
+
}
|
|
67
89
|
return {
|
|
68
90
|
key,
|
|
69
91
|
model,
|
|
@@ -83,6 +105,7 @@ function mapRelationship(rel) {
|
|
|
83
105
|
isNewStructure,
|
|
84
106
|
descriptorName,
|
|
85
107
|
importPath,
|
|
108
|
+
fields,
|
|
86
109
|
};
|
|
87
110
|
}
|
|
88
111
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relationship-mapper.js","sourceRoot":"","sources":["../../../../scripts/generate-module/transformers/relationship-mapper.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"relationship-mapper.js","sourceRoot":"","sources":["../../../../scripts/generate-module/transformers/relationship-mapper.ts"],"names":[],"mappings":"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"}
|