@carlonicora/nestjs-neo4jsonapi 1.5.1 → 1.7.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/agents/community.detector/services/community.detector.service.d.ts.map +1 -1
- package/dist/agents/community.detector/services/community.detector.service.js.map +1 -1
- package/dist/bootstrap/app.module.factory.d.ts.map +1 -1
- package/dist/bootstrap/app.module.factory.js +23 -1
- package/dist/bootstrap/app.module.factory.js.map +1 -1
- package/dist/common/guards/index.d.ts +1 -1
- package/dist/common/guards/index.d.ts.map +1 -1
- package/dist/common/guards/index.js +1 -1
- package/dist/common/guards/index.js.map +1 -1
- package/dist/common/interfaces/entity.schema.interface.d.ts +10 -2
- package/dist/common/interfaces/entity.schema.interface.d.ts.map +1 -1
- package/dist/config/base.config.d.ts.map +1 -1
- package/dist/config/base.config.js +2 -0
- package/dist/config/base.config.js.map +1 -1
- package/dist/config/interfaces/config.discord.interface.d.ts +2 -0
- package/dist/config/interfaces/config.discord.interface.d.ts.map +1 -1
- package/dist/config/interfaces/index.d.ts +1 -0
- package/dist/config/interfaces/index.d.ts.map +1 -1
- package/dist/config/interfaces/index.js +1 -0
- package/dist/config/interfaces/index.js.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.d.ts.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.js +42 -6
- package/dist/core/neo4j/abstracts/abstract.repository.js.map +1 -1
- package/dist/foundations/auth/auth.module.js +2 -2
- package/dist/foundations/auth/auth.module.js.map +1 -1
- package/dist/foundations/auth/services/auth.discord.service.d.ts +3 -3
- package/dist/foundations/auth/services/auth.discord.service.d.ts.map +1 -1
- package/dist/foundations/auth/services/auth.discord.service.js +6 -25
- package/dist/foundations/auth/services/auth.discord.service.js.map +1 -1
- package/dist/foundations/company/repositories/company.repository.d.ts.map +1 -1
- package/dist/foundations/company/repositories/company.repository.js +77 -36
- package/dist/foundations/company/repositories/company.repository.js.map +1 -1
- package/dist/foundations/discord/discord.module.d.ts +3 -0
- package/dist/foundations/discord/discord.module.d.ts.map +1 -0
- package/dist/foundations/discord/discord.module.js +23 -0
- package/dist/foundations/discord/discord.module.js.map +1 -0
- package/dist/foundations/discord/index.d.ts +4 -0
- package/dist/foundations/discord/index.d.ts.map +1 -0
- package/dist/foundations/discord/index.js +20 -0
- package/dist/foundations/discord/index.js.map +1 -0
- package/dist/foundations/discord/serialisers/discord.error.serialiser.d.ts +8 -0
- package/dist/foundations/discord/serialisers/discord.error.serialiser.d.ts.map +1 -0
- package/dist/foundations/discord/serialisers/discord.error.serialiser.js +23 -0
- package/dist/foundations/discord/serialisers/discord.error.serialiser.js.map +1 -0
- package/dist/foundations/discord/services/discord.service.d.ts +11 -0
- package/dist/foundations/discord/services/discord.service.d.ts.map +1 -0
- package/dist/foundations/discord/services/discord.service.js +54 -0
- package/dist/foundations/discord/services/discord.service.js.map +1 -0
- package/dist/foundations/discord-user/discord-user.module.d.ts +3 -0
- package/dist/foundations/discord-user/discord-user.module.d.ts.map +1 -0
- package/dist/foundations/discord-user/{discord.module.js → discord-user.module.js} +4 -3
- package/dist/foundations/discord-user/discord-user.module.js.map +1 -0
- package/dist/foundations/discord-user/index.d.ts +5 -0
- package/dist/foundations/discord-user/index.d.ts.map +1 -0
- package/dist/foundations/discord-user/index.js +21 -0
- package/dist/foundations/discord-user/index.js.map +1 -0
- package/dist/foundations/discord-user/services/discord-user.service.d.ts +18 -0
- package/dist/foundations/discord-user/services/discord-user.service.d.ts.map +1 -0
- package/dist/foundations/discord-user/services/discord-user.service.js +59 -0
- package/dist/foundations/discord-user/services/discord-user.service.js.map +1 -0
- package/dist/foundations/discord-user/types/discord.user.type.d.ts +1 -1
- package/dist/foundations/discord-user/types/discord.user.type.d.ts.map +1 -1
- package/dist/foundations/foundations.modules.js +2 -2
- package/dist/foundations/foundations.modules.js.map +1 -1
- package/dist/foundations/index.d.ts +2 -0
- package/dist/foundations/index.d.ts.map +1 -1
- package/dist/foundations/index.js +2 -0
- package/dist/foundations/index.js.map +1 -1
- package/dist/scripts/generate-module/generator.d.ts.map +1 -1
- package/dist/scripts/generate-module/generator.js +21 -8
- package/dist/scripts/generate-module/generator.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 +40 -13
- package/dist/scripts/generate-module/templates/controller.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 +34 -13
- 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 +34 -13
- 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 +48 -24
- package/dist/scripts/generate-module/templates/entity.template.js.map +1 -1
- package/dist/scripts/generate-module/templates/meta.template.d.ts +12 -0
- package/dist/scripts/generate-module/templates/meta.template.d.ts.map +1 -0
- package/dist/scripts/generate-module/templates/meta.template.js +25 -0
- package/dist/scripts/generate-module/templates/meta.template.js.map +1 -0
- package/dist/scripts/generate-module/transformers/import-resolver.d.ts +70 -2
- package/dist/scripts/generate-module/transformers/import-resolver.d.ts.map +1 -1
- package/dist/scripts/generate-module/transformers/import-resolver.js +99 -4
- package/dist/scripts/generate-module/transformers/import-resolver.js.map +1 -1
- package/dist/scripts/generate-module/transformers/nested-route-generator.d.ts.map +1 -1
- package/dist/scripts/generate-module/transformers/nested-route-generator.js +13 -3
- package/dist/scripts/generate-module/transformers/nested-route-generator.js.map +1 -1
- package/dist/scripts/generate-module/transformers/relationship-mapper.d.ts +3 -3
- package/dist/scripts/generate-module/transformers/relationship-mapper.d.ts.map +1 -1
- package/dist/scripts/generate-module/transformers/relationship-mapper.js +33 -10
- package/dist/scripts/generate-module/transformers/relationship-mapper.js.map +1 -1
- package/dist/scripts/generate-module/types/template-data.interface.d.ts +7 -0
- package/dist/scripts/generate-module/types/template-data.interface.d.ts.map +1 -1
- package/dist/scripts/generate-module/utils/type-utils.d.ts +61 -0
- package/dist/scripts/generate-module/utils/type-utils.d.ts.map +1 -0
- package/dist/scripts/generate-module/utils/type-utils.js +205 -0
- package/dist/scripts/generate-module/utils/type-utils.js.map +1 -0
- package/dist/scripts/generate-module/validators/json-schema-validator.d.ts.map +1 -1
- package/dist/scripts/generate-module/validators/json-schema-validator.js +9 -0
- package/dist/scripts/generate-module/validators/json-schema-validator.js.map +1 -1
- package/package.json +8 -6
- package/dist/foundations/discord-user/discord.module.d.ts +0 -3
- package/dist/foundations/discord-user/discord.module.d.ts.map +0 -1
- package/dist/foundations/discord-user/discord.module.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foundations.modules.js","sourceRoot":"","sources":["../../src/foundations/foundations.modules.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,sEAAkE;AAClE,uDAAmD;AACnD,oDAAgD;AAChD,uDAAmD;AACnD,6DAAyD;AACzD,6DAAyD;AACzD,6DAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"foundations.modules.js","sourceRoot":"","sources":["../../src/foundations/foundations.modules.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,sEAAkE;AAClE,uDAAmD;AACnD,oDAAgD;AAChD,uDAAmD;AACnD,6DAAyD;AACzD,6DAAyD;AACzD,6DAAyD;AAEzD,4EAAuE;AACvE,6DAAyD;AACzD,sEAAkE;AAClE,0DAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,mEAA+D;AAC/D,oDAAgD;AAChD,8CAA0C;AAC1C,sEAAkE;AAClE,oDAAgD;AAUhD;;;GAGG;AACH,MAAM,yBAAyB,GAAG;IAChC,oCAAgB;IAChB,0BAAW;IACX,wBAAU;IACV,0BAAW;IACX,8BAAa;IACb,8BAAa;IACb,uCAAiB;IACjB,8BAAa;IACb,oCAAgB;IAChB,4BAAY;IACZ,wCAAkB;IAClB,wBAAU;IACV,kCAAe;IACf,wBAAU;IACV,oBAAQ;IACR,oCAAgB;IAChB,wBAAU;CACX,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEI,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,MAAgC;QAC7C,OAAO;YACL,MAAM,EAAE,mBAAiB;YACzB,OAAO,EAAE,CAAC,GAAG,yBAAyB,EAAE,8BAAa,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YACxF,OAAO,EAAE,CAAC,GAAG,yBAAyB,EAAE,8BAAa,CAAC;SACvD,CAAC;IACJ,CAAC;CACF,CAAA;AAdY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,iBAAiB,CAc7B"}
|
|
@@ -9,6 +9,8 @@ export * from "./chunk";
|
|
|
9
9
|
export * from "./chunker";
|
|
10
10
|
export * from "./company";
|
|
11
11
|
export * from "./content";
|
|
12
|
+
export * from "./discord";
|
|
13
|
+
export * from "./discord-user";
|
|
12
14
|
export * from "./feature";
|
|
13
15
|
export * from "./keyconcept";
|
|
14
16
|
export * from "./module";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/foundations/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,cAAc,uBAAuB,CAAC;AAGtC,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,MAAM,CAAC;AACrB,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/foundations/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,cAAc,uBAAuB,CAAC;AAGtC,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,MAAM,CAAC;AACrB,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC"}
|
|
@@ -27,6 +27,8 @@ __exportStar(require("./chunk"), exports);
|
|
|
27
27
|
__exportStar(require("./chunker"), exports);
|
|
28
28
|
__exportStar(require("./company"), exports);
|
|
29
29
|
__exportStar(require("./content"), exports);
|
|
30
|
+
__exportStar(require("./discord"), exports);
|
|
31
|
+
__exportStar(require("./discord-user"), exports);
|
|
30
32
|
__exportStar(require("./feature"), exports);
|
|
31
33
|
__exportStar(require("./keyconcept"), exports);
|
|
32
34
|
__exportStar(require("./module"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/foundations/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;AAEH,sFAAsF;AACtF,wDAAsC;AAEtC,iFAAiF;AACjF,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,4CAA0B;AAC1B,4CAA0B;AAC1B,+CAA6B;AAC7B,2CAAyB;AACzB,iDAA+B;AAC/B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,uCAAqB;AACrB,+CAA6B;AAC7B,yCAAuB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/foundations/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;AAEH,sFAAsF;AACtF,wDAAsC;AAEtC,iFAAiF;AACjF,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,4CAA0B;AAC1B,4CAA0B;AAC1B,iDAA+B;AAC/B,4CAA0B;AAC1B,+CAA6B;AAC7B,2CAAyB;AACzB,iDAA+B;AAC/B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,uCAAqB;AACrB,+CAA6B;AAC7B,yCAAuB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../scripts/generate-module/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../scripts/generate-module/generator.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6JlF"}
|
|
@@ -41,6 +41,7 @@ const relationship_mapper_1 = require("./transformers/relationship-mapper");
|
|
|
41
41
|
const nested_route_generator_1 = require("./transformers/nested-route-generator");
|
|
42
42
|
const json_schema_validator_1 = require("./validators/json-schema-validator");
|
|
43
43
|
const entity_template_1 = require("./templates/entity.template");
|
|
44
|
+
const meta_template_1 = require("./templates/meta.template");
|
|
44
45
|
const module_template_1 = require("./templates/module.template");
|
|
45
46
|
const service_template_1 = require("./templates/service.template");
|
|
46
47
|
const repository_template_1 = require("./templates/repository.template");
|
|
@@ -50,6 +51,7 @@ const dto_post_template_1 = require("./templates/dto.post.template");
|
|
|
50
51
|
const dto_put_template_1 = require("./templates/dto.put.template");
|
|
51
52
|
const file_writer_1 = require("./utils/file-writer");
|
|
52
53
|
const module_registrar_1 = require("./utils/module-registrar");
|
|
54
|
+
const type_utils_1 = require("./utils/type-utils");
|
|
53
55
|
/**
|
|
54
56
|
* Main generator function
|
|
55
57
|
*
|
|
@@ -89,13 +91,19 @@ async function generateModule(options) {
|
|
|
89
91
|
endpoint: jsonSchema.endpointName,
|
|
90
92
|
nodeName: names.camelCase,
|
|
91
93
|
});
|
|
92
|
-
// Map fields to template fields
|
|
93
|
-
const fields = jsonSchema.fields.map((field) =>
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
// Map fields to template fields with type normalization
|
|
95
|
+
const fields = jsonSchema.fields.map((field) => {
|
|
96
|
+
const normalizedType = (0, type_utils_1.normalizeCypherType)(field.type);
|
|
97
|
+
if (!normalizedType) {
|
|
98
|
+
throw new Error(`Invalid field type "${field.type}" for field "${field.name}". Valid types: string, number, boolean, date, datetime, json (and their array variants with [])`);
|
|
99
|
+
}
|
|
100
|
+
return {
|
|
101
|
+
name: field.name,
|
|
102
|
+
type: normalizedType,
|
|
103
|
+
required: !field.nullable,
|
|
104
|
+
tsType: (0, type_utils_1.getTsType)(normalizedType),
|
|
105
|
+
};
|
|
106
|
+
});
|
|
99
107
|
// Build template data
|
|
100
108
|
const templateData = {
|
|
101
109
|
names,
|
|
@@ -115,7 +123,7 @@ async function generateModule(options) {
|
|
|
115
123
|
name: field.name,
|
|
116
124
|
type: field.tsType,
|
|
117
125
|
isOptional: !field.required,
|
|
118
|
-
decorators:
|
|
126
|
+
decorators: (0, type_utils_1.getValidationDecorators)(field.type, field.required),
|
|
119
127
|
})),
|
|
120
128
|
postDtoRelationships: [],
|
|
121
129
|
putDtoRelationships: [],
|
|
@@ -124,6 +132,11 @@ async function generateModule(options) {
|
|
|
124
132
|
console.log(`✓ Generating files...`);
|
|
125
133
|
const basePath = `apps/api/src/${jsonSchema.targetDir}/${names.kebabCase}`;
|
|
126
134
|
const filesToWrite = [
|
|
135
|
+
// Meta (must be generated before entity to avoid circular dependencies)
|
|
136
|
+
{
|
|
137
|
+
path: path.resolve(process.cwd(), `${basePath}/entities/${names.kebabCase}.meta.ts`),
|
|
138
|
+
content: (0, meta_template_1.generateMetaFile)(templateData),
|
|
139
|
+
},
|
|
127
140
|
// Entity
|
|
128
141
|
{
|
|
129
142
|
path: path.resolve(process.cwd(), `${basePath}/entities/${names.kebabCase}.ts`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../scripts/generate-module/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../scripts/generate-module/generator.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,CA4MjE"}
|
|
@@ -10,27 +10,54 @@ const import_resolver_1 = require("../transformers/import-resolver");
|
|
|
10
10
|
*/
|
|
11
11
|
function generateControllerFile(data) {
|
|
12
12
|
const { names, targetDir, nestedRoutes } = data;
|
|
13
|
-
//
|
|
14
|
-
const
|
|
15
|
-
|
|
13
|
+
// Separate OLD and NEW structure routes
|
|
14
|
+
const oldStructureRoutes = nestedRoutes.filter((route) => !route.isNewStructure);
|
|
15
|
+
const newStructureRoutes = nestedRoutes.filter((route) => route.isNewStructure);
|
|
16
|
+
// Build meta imports for OLD structure nested routes
|
|
17
|
+
const oldMetaImportPaths = new Map();
|
|
18
|
+
for (const route of oldStructureRoutes) {
|
|
16
19
|
const rel = data.relationships.find((r) => r.model === route.relatedMeta);
|
|
17
20
|
const path = (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
18
21
|
? import_resolver_1.FOUNDATION_PACKAGE
|
|
19
|
-
:
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
: (0, import_resolver_1.resolveMetaImportPath)({
|
|
23
|
+
fromDir: targetDir,
|
|
24
|
+
fromModule: names.kebabCase,
|
|
25
|
+
toDir: rel.relatedEntity.directory,
|
|
26
|
+
toModule: rel.relatedEntity.kebabCase,
|
|
27
|
+
});
|
|
28
|
+
if (!oldMetaImportPaths.has(path)) {
|
|
29
|
+
oldMetaImportPaths.set(path, []);
|
|
22
30
|
}
|
|
23
|
-
|
|
31
|
+
if (!oldMetaImportPaths.get(path).includes(route.relatedMeta)) {
|
|
32
|
+
oldMetaImportPaths.get(path).push(route.relatedMeta);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
// Build Descriptor imports for NEW structure nested routes
|
|
36
|
+
const newDescriptorImportPaths = new Map();
|
|
37
|
+
for (const route of newStructureRoutes) {
|
|
38
|
+
if (route.importPath && route.descriptorName) {
|
|
39
|
+
if (!newDescriptorImportPaths.has(route.importPath)) {
|
|
40
|
+
newDescriptorImportPaths.set(route.importPath, []);
|
|
41
|
+
}
|
|
42
|
+
if (!newDescriptorImportPaths.get(route.importPath).includes(route.descriptorName)) {
|
|
43
|
+
newDescriptorImportPaths.get(route.importPath).push(route.descriptorName);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
// Combine all import lines
|
|
48
|
+
const importLines = [];
|
|
49
|
+
for (const [path, items] of oldMetaImportPaths.entries()) {
|
|
50
|
+
importLines.push(`import { ${items.join(", ")} } from "${path}";`);
|
|
51
|
+
}
|
|
52
|
+
for (const [path, items] of newDescriptorImportPaths.entries()) {
|
|
53
|
+
importLines.push(`import { ${items.join(", ")} } from "${path}";`);
|
|
24
54
|
}
|
|
25
|
-
const metaImportsCode =
|
|
26
|
-
? `\n${Array.from(metaImportPaths.entries())
|
|
27
|
-
.map(([path, items]) => `import { ${items.join(", ")} } from "${path}";`)
|
|
28
|
-
.join("\n")}\n`
|
|
29
|
-
: "";
|
|
55
|
+
const metaImportsCode = importLines.length > 0 ? `\n${importLines.join("\n")}\n` : "";
|
|
30
56
|
// Generate nested route methods
|
|
57
|
+
// The route.path is pre-computed by nested-route-generator with correct endpoint access pattern
|
|
31
58
|
const nestedRouteMethods = nestedRoutes
|
|
32
59
|
.map((route) => `
|
|
33
|
-
@Get(
|
|
60
|
+
@Get(\`${route.path}\`)
|
|
34
61
|
async ${route.methodName}(
|
|
35
62
|
@Req() req: AuthenticatedRequest,
|
|
36
63
|
@Res() reply: FastifyReply,
|
|
@@ -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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"}
|
|
@@ -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;AA2BxF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA2G9D"}
|
|
@@ -2,6 +2,30 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generatePostDTOFile = generatePostDTOFile;
|
|
4
4
|
const import_resolver_1 = require("../transformers/import-resolver");
|
|
5
|
+
const type_utils_1 = require("../utils/type-utils");
|
|
6
|
+
/**
|
|
7
|
+
* Get the import path for a relationship's DTO
|
|
8
|
+
*/
|
|
9
|
+
function getDtoImportPath(rel, fromDir, fromModule) {
|
|
10
|
+
if (rel.isNewStructure) {
|
|
11
|
+
// NEW structure: use absolute path from src
|
|
12
|
+
return (0, import_resolver_1.resolveNewDtoImportPath)({
|
|
13
|
+
directory: rel.relatedEntity.directory,
|
|
14
|
+
moduleName: rel.relatedEntity.kebabCase,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
// OLD structure: foundation or relative path with proper resolution
|
|
19
|
+
return (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
20
|
+
? import_resolver_1.FOUNDATION_PACKAGE
|
|
21
|
+
: (0, import_resolver_1.resolveDtoImportPath)({
|
|
22
|
+
fromDir,
|
|
23
|
+
fromModule,
|
|
24
|
+
toDir: rel.relatedEntity.directory,
|
|
25
|
+
toModule: rel.relatedEntity.kebabCase,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
}
|
|
5
29
|
/**
|
|
6
30
|
* Generate POST DTO file content
|
|
7
31
|
*
|
|
@@ -9,16 +33,14 @@ const import_resolver_1 = require("../transformers/import-resolver");
|
|
|
9
33
|
* @returns Generated TypeScript code
|
|
10
34
|
*/
|
|
11
35
|
function generatePostDTOFile(data) {
|
|
12
|
-
const { names, targetDir, fields, relationships } = data;
|
|
36
|
+
const { names, targetDir, fields, relationships, dtoFields } = data;
|
|
13
37
|
// Build DTO imports for relationships (excluding contextKey)
|
|
14
38
|
const dtoImportPaths = new Map();
|
|
15
39
|
for (const rel of relationships) {
|
|
16
40
|
// Skip contextKey relationships (like Author)
|
|
17
41
|
if (rel.contextKey)
|
|
18
42
|
continue;
|
|
19
|
-
const importPath = (
|
|
20
|
-
? import_resolver_1.FOUNDATION_PACKAGE
|
|
21
|
-
: `../../${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/dtos/${rel.relatedEntity.kebabCase}.dto`;
|
|
43
|
+
const importPath = getDtoImportPath(rel, targetDir, names.kebabCase);
|
|
22
44
|
if (!dtoImportPaths.has(importPath)) {
|
|
23
45
|
dtoImportPaths.set(importPath, new Set());
|
|
24
46
|
}
|
|
@@ -33,17 +55,16 @@ function generatePostDTOFile(data) {
|
|
|
33
55
|
.map(([path, items]) => `import { ${Array.from(items).join(", ")} } from "${path}";`)
|
|
34
56
|
.join("\n")}\n`
|
|
35
57
|
: "";
|
|
36
|
-
// Build attribute validation
|
|
37
|
-
const attributeFields =
|
|
58
|
+
// Build attribute validation using pre-computed decorators from dtoFields
|
|
59
|
+
const attributeFields = dtoFields
|
|
38
60
|
.map((field) => {
|
|
39
|
-
const
|
|
40
|
-
decorators.
|
|
41
|
-
decorators.push("@IsNotEmpty()");
|
|
42
|
-
decorators.push(`@IsString()`); // Simplified - all fields are strings in current schema
|
|
43
|
-
const optional = !field.required ? "?" : "";
|
|
44
|
-
return ` ${decorators.join("\n ")}\n ${field.name}${optional}: ${field.tsType};`;
|
|
61
|
+
const optional = field.isOptional ? "?" : "";
|
|
62
|
+
return ` ${field.decorators.join("\n ")}\n ${field.name}${optional}: ${field.type};`;
|
|
45
63
|
})
|
|
46
64
|
.join("\n\n");
|
|
65
|
+
// Get dynamic validator imports based on field types
|
|
66
|
+
const fieldTypes = fields.map((f) => f.type);
|
|
67
|
+
const validatorImports = (0, type_utils_1.getValidationImports)(fieldTypes);
|
|
47
68
|
// Build relationship validation (exclude contextKey)
|
|
48
69
|
const relationshipFields = relationships
|
|
49
70
|
.filter((rel) => !rel.contextKey) // Exclude Author and other contextKey relationships
|
|
@@ -69,7 +90,7 @@ function generatePostDTOFile(data) {
|
|
|
69
90
|
})
|
|
70
91
|
.join("\n\n");
|
|
71
92
|
return `import { Type } from "class-transformer";
|
|
72
|
-
import {
|
|
93
|
+
import { ${validatorImports.join(", ")} } from "class-validator";${dtoImportsCode}
|
|
73
94
|
import { ${names.pascalCase}Descriptor } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}";
|
|
74
95
|
|
|
75
96
|
export class ${names.pascalCase}PostAttributesDTO {
|
|
@@ -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,
|
|
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;AA2BxF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA2G7D"}
|
|
@@ -2,6 +2,30 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generatePutDTOFile = generatePutDTOFile;
|
|
4
4
|
const import_resolver_1 = require("../transformers/import-resolver");
|
|
5
|
+
const type_utils_1 = require("../utils/type-utils");
|
|
6
|
+
/**
|
|
7
|
+
* Get the import path for a relationship's DTO
|
|
8
|
+
*/
|
|
9
|
+
function getDtoImportPath(rel, fromDir, fromModule) {
|
|
10
|
+
if (rel.isNewStructure) {
|
|
11
|
+
// NEW structure: use absolute path from src
|
|
12
|
+
return (0, import_resolver_1.resolveNewDtoImportPath)({
|
|
13
|
+
directory: rel.relatedEntity.directory,
|
|
14
|
+
moduleName: rel.relatedEntity.kebabCase,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
// OLD structure: foundation or relative path with proper resolution
|
|
19
|
+
return (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
20
|
+
? import_resolver_1.FOUNDATION_PACKAGE
|
|
21
|
+
: (0, import_resolver_1.resolveDtoImportPath)({
|
|
22
|
+
fromDir,
|
|
23
|
+
fromModule,
|
|
24
|
+
toDir: rel.relatedEntity.directory,
|
|
25
|
+
toModule: rel.relatedEntity.kebabCase,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
}
|
|
5
29
|
/**
|
|
6
30
|
* Generate PUT DTO file content
|
|
7
31
|
* Same as POST but excludes contextKey relationships (like Author)
|
|
@@ -10,16 +34,14 @@ const import_resolver_1 = require("../transformers/import-resolver");
|
|
|
10
34
|
* @returns Generated TypeScript code
|
|
11
35
|
*/
|
|
12
36
|
function generatePutDTOFile(data) {
|
|
13
|
-
const { names, targetDir, fields, relationships } = data;
|
|
37
|
+
const { names, targetDir, fields, relationships, dtoFields } = data;
|
|
14
38
|
// Build DTO imports for relationships (excluding contextKey)
|
|
15
39
|
const dtoImportPaths = new Map();
|
|
16
40
|
for (const rel of relationships) {
|
|
17
41
|
// Skip contextKey relationships (like Author) - same as POST
|
|
18
42
|
if (rel.contextKey)
|
|
19
43
|
continue;
|
|
20
|
-
const importPath = (
|
|
21
|
-
? import_resolver_1.FOUNDATION_PACKAGE
|
|
22
|
-
: `../../${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/dtos/${rel.relatedEntity.kebabCase}.dto`;
|
|
44
|
+
const importPath = getDtoImportPath(rel, targetDir, names.kebabCase);
|
|
23
45
|
if (!dtoImportPaths.has(importPath)) {
|
|
24
46
|
dtoImportPaths.set(importPath, new Set());
|
|
25
47
|
}
|
|
@@ -34,17 +56,16 @@ function generatePutDTOFile(data) {
|
|
|
34
56
|
.map(([path, items]) => `import { ${Array.from(items).join(", ")} } from "${path}";`)
|
|
35
57
|
.join("\n")}\n`
|
|
36
58
|
: "";
|
|
37
|
-
// Build attribute validation (same as POST)
|
|
38
|
-
const attributeFields =
|
|
59
|
+
// Build attribute validation using pre-computed decorators from dtoFields (same as POST)
|
|
60
|
+
const attributeFields = dtoFields
|
|
39
61
|
.map((field) => {
|
|
40
|
-
const
|
|
41
|
-
decorators.
|
|
42
|
-
decorators.push("@IsNotEmpty()");
|
|
43
|
-
decorators.push(`@IsString()`); // Simplified - all fields are strings in current schema
|
|
44
|
-
const optional = !field.required ? "?" : "";
|
|
45
|
-
return ` ${decorators.join("\n ")}\n ${field.name}${optional}: ${field.tsType};`;
|
|
62
|
+
const optional = field.isOptional ? "?" : "";
|
|
63
|
+
return ` ${field.decorators.join("\n ")}\n ${field.name}${optional}: ${field.type};`;
|
|
46
64
|
})
|
|
47
65
|
.join("\n\n");
|
|
66
|
+
// Get dynamic validator imports based on field types
|
|
67
|
+
const fieldTypes = fields.map((f) => f.type);
|
|
68
|
+
const validatorImports = (0, type_utils_1.getValidationImports)(fieldTypes);
|
|
48
69
|
// Build relationship validation (exclude contextKey - same as POST)
|
|
49
70
|
const relationshipFields = relationships
|
|
50
71
|
.filter((rel) => !rel.contextKey) // Exclude Author and other contextKey relationships
|
|
@@ -70,7 +91,7 @@ function generatePutDTOFile(data) {
|
|
|
70
91
|
})
|
|
71
92
|
.join("\n\n");
|
|
72
93
|
return `import { Type } from "class-transformer";
|
|
73
|
-
import {
|
|
94
|
+
import { ${validatorImports.join(", ")} } from "class-validator";${dtoImportsCode}
|
|
74
95
|
import { ${names.pascalCase}Descriptor } from "src/${targetDir}/${names.kebabCase}/entities/${names.kebabCase}";
|
|
75
96
|
|
|
76
97
|
export class ${names.pascalCase}PutAttributesDTO {
|
|
@@ -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,
|
|
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,CAsI7D"}
|
|
@@ -2,6 +2,28 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateEntityFile = generateEntityFile;
|
|
4
4
|
const import_resolver_1 = require("../transformers/import-resolver");
|
|
5
|
+
/**
|
|
6
|
+
* Get the entity type import path
|
|
7
|
+
*
|
|
8
|
+
* For foundation entities: imports from the package
|
|
9
|
+
* For feature entities: relative path to entity file
|
|
10
|
+
*/
|
|
11
|
+
function getEntityImportPath(rel) {
|
|
12
|
+
return (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
13
|
+
? import_resolver_1.FOUNDATION_PACKAGE
|
|
14
|
+
: `src/${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/entities/${rel.relatedEntity.kebabCase}`;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Get the meta import path
|
|
18
|
+
*
|
|
19
|
+
* For foundation entities: imports from the package (metas are re-exported)
|
|
20
|
+
* For feature entities: relative path to meta file
|
|
21
|
+
*/
|
|
22
|
+
function getMetaImportPath(rel) {
|
|
23
|
+
return (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
24
|
+
? import_resolver_1.FOUNDATION_PACKAGE
|
|
25
|
+
: `src/${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/entities/${rel.relatedEntity.kebabCase}.meta`;
|
|
26
|
+
}
|
|
5
27
|
/**
|
|
6
28
|
* Generate entity file content (Type + Descriptor)
|
|
7
29
|
*
|
|
@@ -12,38 +34,34 @@ const import_resolver_1 = require("../transformers/import-resolver");
|
|
|
12
34
|
* @returns Generated TypeScript code
|
|
13
35
|
*/
|
|
14
36
|
function generateEntityFile(data) {
|
|
15
|
-
const { names, endpoint, nodeName, labelName, fields, relationships
|
|
37
|
+
const { names, endpoint, nodeName, labelName, fields, relationships } = data;
|
|
16
38
|
// Build imports
|
|
17
39
|
const libraryImports = ["defineEntity", "Entity"];
|
|
18
40
|
if (data.isCompanyScoped) {
|
|
19
41
|
libraryImports.push("Company");
|
|
20
42
|
}
|
|
21
|
-
//
|
|
22
|
-
|
|
43
|
+
// All entities use meta pattern to avoid circular dependencies
|
|
44
|
+
// Entity type imports (grouped by path) - for type annotations
|
|
23
45
|
const entityImportsByPath = new Map();
|
|
46
|
+
const processedEntities = new Set();
|
|
24
47
|
for (const rel of relationships) {
|
|
25
|
-
if (!
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const importPath = (0, import_resolver_1.isFoundationImport)(rel.relatedEntity.directory)
|
|
29
|
-
? import_resolver_1.FOUNDATION_PACKAGE
|
|
30
|
-
: `../../${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/entities/${rel.relatedEntity.kebabCase}.entity`;
|
|
48
|
+
if (!processedEntities.has(rel.relatedEntity.name)) {
|
|
49
|
+
processedEntities.add(rel.relatedEntity.name);
|
|
50
|
+
const importPath = getEntityImportPath(rel);
|
|
31
51
|
if (!entityImportsByPath.has(importPath)) {
|
|
32
52
|
entityImportsByPath.set(importPath, []);
|
|
33
53
|
}
|
|
34
54
|
entityImportsByPath.get(importPath).push(rel.relatedEntity.name);
|
|
35
55
|
}
|
|
36
56
|
}
|
|
37
|
-
//
|
|
38
|
-
const uniqueMetaImports = new Set();
|
|
57
|
+
// Meta imports (grouped by path) - for relationship model references
|
|
39
58
|
const metaImportsByPath = new Map();
|
|
59
|
+
const processedMetas = new Set();
|
|
40
60
|
for (const rel of relationships) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const importPath = (
|
|
45
|
-
? import_resolver_1.FOUNDATION_PACKAGE
|
|
46
|
-
: `../../${rel.relatedEntity.directory}/${rel.relatedEntity.kebabCase}/entities/${rel.relatedEntity.kebabCase}.meta`;
|
|
61
|
+
// Model is like "userMeta", "ownerMeta", "campaignMeta", etc.
|
|
62
|
+
if (!processedMetas.has(rel.model)) {
|
|
63
|
+
processedMetas.add(rel.model);
|
|
64
|
+
const importPath = getMetaImportPath(rel);
|
|
47
65
|
if (!metaImportsByPath.has(importPath)) {
|
|
48
66
|
metaImportsByPath.set(importPath, []);
|
|
49
67
|
}
|
|
@@ -78,13 +96,19 @@ function generateEntityFile(data) {
|
|
|
78
96
|
return ` ${rel.key}: {\n ${parts.join(",\n ")},\n },`;
|
|
79
97
|
})
|
|
80
98
|
.join("\n");
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
.join("
|
|
99
|
+
// Build all import lines
|
|
100
|
+
const importLines = [];
|
|
101
|
+
// Library imports (always first)
|
|
102
|
+
importLines.push(`import { ${libraryImports.join(", ")} } from "@carlonicora/nestjs-neo4jsonapi";`);
|
|
103
|
+
// Entity type imports (for type annotations in the type definition)
|
|
104
|
+
for (const [importPath, items] of entityImportsByPath.entries()) {
|
|
105
|
+
importLines.push(`import { ${items.join(", ")} } from "${importPath}";`);
|
|
106
|
+
}
|
|
107
|
+
// Meta imports (for relationship model references)
|
|
108
|
+
for (const [importPath, items] of metaImportsByPath.entries()) {
|
|
109
|
+
importLines.push(`import { ${items.join(", ")} } from "${importPath}";`);
|
|
110
|
+
}
|
|
111
|
+
return `${importLines.join("\n")}
|
|
88
112
|
|
|
89
113
|
/**
|
|
90
114
|
* ${names.pascalCase} Entity Type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"entity.template.js","sourceRoot":"","sources":["../../../../scripts/generate-module/templates/entity.template.ts"],"names":[],"mappings":";;AAoCA,gDAsIC;AAzKD,qEAAyF;AAEzF;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,GAA2B;IACtD,OAAO,IAAA,oCAAkB,EAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC;QACpD,CAAC,CAAC,oCAAkB;QACpB,CAAC,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,SAAS,IAAI,GAAG,CAAC,aAAa,CAAC,SAAS,aAAa,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;AAClH,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,GAA2B;IACpD,OAAO,IAAA,oCAAkB,EAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC;QACpD,CAAC,CAAC,oCAAkB;QACpB,CAAC,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,SAAS,IAAI,GAAG,CAAC,aAAa,CAAC,SAAS,aAAa,GAAG,CAAC,aAAa,CAAC,SAAS,OAAO,CAAC;AACvH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAAC,IAAkB;IACnD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAE7E,gBAAgB;IAChB,MAAM,cAAc,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAED,+DAA+D;IAC/D,+DAA+D;IAC/D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE5C,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACzC,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC1C,CAAC;YACD,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,qEAAqE;IACrE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAoB,CAAC;IACtD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAEzC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,8DAA8D;QAC9D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACvC,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxC,CAAC;YACD,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,MAAM,gBAAgB,GAAG,MAAM;SAC5B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACvD,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,gDAAgD;IAChD,MAAM,uBAAuB,GAAG,aAAa;SAC1C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;QAC5C,KAAK,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,YAAY,GAAG,CAAC,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC;QAEhD,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,OAAO,GAAG,CAAC,GAAG,cAAc,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;IACxE,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,yBAAyB;IACzB,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,iCAAiC;IACjC,WAAW,CAAC,IAAI,CAAC,YAAY,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;IAEpG,oEAAoE;IACpE,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC;QAChE,WAAW,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,UAAU,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,mDAAmD;IACnD,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9D,WAAW,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,UAAU,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;;KAG7B,KAAK,CAAC,UAAU;;cAEP,KAAK,CAAC,UAAU;EAC5B,MAAM;SACL,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,OAAO,KAAK,KAAK,CAAC,IAAI,GAAG,QAAQ,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC;IACxD,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC;;EAEX,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa;SAClE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC;QACjG,OAAO,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,KAAK,IAAI,GAAG,CAAC;IAC7C,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC;;;;KAIR,KAAK,CAAC,UAAU;;oCAEe,KAAK,CAAC,UAAU;;;eAGrC,KAAK,CAAC,UAAU,6BAA6B,KAAK,CAAC,UAAU;WACjE,QAAQ;eACJ,QAAQ;eACR,QAAQ;gBACP,SAAS;EACvB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE;;EAE5D,gBAAgB;;;;EAIhB,uBAAuB;;;;cAIX,KAAK,CAAC,UAAU,2BAA2B,KAAK,CAAC,UAAU;CACxE,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { TemplateData } from "../types/template-data.interface";
|
|
2
|
+
/**
|
|
3
|
+
* Generate meta file content
|
|
4
|
+
*
|
|
5
|
+
* Meta files contain lightweight metadata (type, endpoint, nodeName, labelName)
|
|
6
|
+
* that can be imported without causing circular dependencies.
|
|
7
|
+
*
|
|
8
|
+
* @param data - Template data
|
|
9
|
+
* @returns Generated TypeScript code for meta file
|
|
10
|
+
*/
|
|
11
|
+
export declare function generateMetaFile(data: TemplateData): string;
|
|
12
|
+
//# sourceMappingURL=meta.template.d.ts.map
|