@steroidsjs/nest 3.0.1 → 3.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/infrastructure/adapters/QueryAdapterTypeORM.js +26 -2
- package/infrastructure/adapters/QueryAdapterTypeORM.js.map +1 -1
- package/infrastructure/applications/base/config.js +1 -1
- package/infrastructure/applications/base/config.js.map +1 -1
- package/infrastructure/applications/console/ConsoleApplication.js +2 -2
- package/infrastructure/applications/console/ConsoleApplication.js.map +1 -1
- package/infrastructure/applications/console/config.js +3 -0
- package/infrastructure/applications/console/config.js.map +1 -1
- package/infrastructure/applications/rest/RestApplication.js +7 -0
- package/infrastructure/applications/rest/RestApplication.js.map +1 -1
- package/infrastructure/applications/rest/exceptions/RequestExecutionException.d.ts +6 -0
- package/infrastructure/applications/rest/exceptions/RequestExecutionException.js +6 -0
- package/infrastructure/applications/rest/exceptions/RequestExecutionException.js.map +1 -1
- package/infrastructure/commands/MigrateCommand.js +1 -0
- package/infrastructure/commands/MigrateCommand.js.map +1 -1
- package/infrastructure/commands/dbml/dbml2code.js +8 -0
- package/infrastructure/commands/dbml/dbml2code.js.map +1 -1
- package/infrastructure/commands/entity-generator/EntityCodeGenerateCommand.d.ts +4 -0
- package/infrastructure/commands/entity-generator/EntityCodeGenerateCommand.js +4 -0
- package/infrastructure/commands/entity-generator/EntityCodeGenerateCommand.js.map +1 -1
- package/infrastructure/commands/entity-generator/EntityCodeGenerator.js +1 -0
- package/infrastructure/commands/entity-generator/EntityCodeGenerator.js.map +1 -1
- package/infrastructure/commands/generate/CustomPostgresQueryRunner.d.ts +77 -0
- package/infrastructure/commands/generate/CustomPostgresQueryRunner.js +149 -0
- package/infrastructure/commands/generate/CustomPostgresQueryRunner.js.map +1 -1
- package/infrastructure/commands/generate/CustomRdbmsSchemaBuilder.js +7 -1
- package/infrastructure/commands/generate/CustomRdbmsSchemaBuilder.js.map +1 -1
- package/infrastructure/commands/generate/index.js +14 -0
- package/infrastructure/commands/generate/index.js.map +1 -1
- package/infrastructure/commands/importClassesFromDirectories.d.ts +3 -0
- package/infrastructure/commands/importClassesFromDirectories.js +3 -0
- package/infrastructure/commands/importClassesFromDirectories.js.map +1 -1
- package/infrastructure/decorators/Module.js +6 -0
- package/infrastructure/decorators/Module.js.map +1 -1
- package/infrastructure/decorators/TableFromModel.js +3 -0
- package/infrastructure/decorators/TableFromModel.js.map +1 -1
- package/infrastructure/decorators/fields/BaseField.js +5 -0
- package/infrastructure/decorators/fields/BaseField.js.map +1 -1
- package/infrastructure/decorators/fields/CreateTimeField.js +1 -0
- package/infrastructure/decorators/fields/CreateTimeField.js.map +1 -1
- package/infrastructure/decorators/fields/DateTimeField.js +5 -0
- package/infrastructure/decorators/fields/DateTimeField.js.map +1 -1
- package/infrastructure/decorators/fields/ExtendField.js +2 -0
- package/infrastructure/decorators/fields/ExtendField.js.map +1 -1
- package/infrastructure/decorators/fields/RelationField.js +3 -0
- package/infrastructure/decorators/fields/RelationField.js.map +1 -1
- package/infrastructure/decorators/fields/RelationIdField.js +2 -0
- package/infrastructure/decorators/fields/RelationIdField.js.map +1 -1
- package/infrastructure/decorators/fields/UidField.js +1 -0
- package/infrastructure/decorators/fields/UidField.js.map +1 -1
- package/infrastructure/decorators/fields/UpdateTimeField.js +1 -0
- package/infrastructure/decorators/fields/UpdateTimeField.js.map +1 -1
- package/infrastructure/filters/ValidationExceptionFilter.js +1 -0
- package/infrastructure/filters/ValidationExceptionFilter.js.map +1 -1
- package/infrastructure/helpers/ModuleHelper.d.ts +1 -0
- package/infrastructure/helpers/ModuleHelper.js +1 -0
- package/infrastructure/helpers/ModuleHelper.js.map +1 -1
- package/infrastructure/helpers/typeORM/ConditionHelperTypeORM.js +21 -18
- package/infrastructure/helpers/typeORM/ConditionHelperTypeORM.js.map +1 -1
- package/infrastructure/helpers/typeORM/SearchHelperTypeORM.js +6 -0
- package/infrastructure/helpers/typeORM/SearchHelperTypeORM.js.map +1 -1
- package/infrastructure/pipes/CreateDtoPipe.js +1 -0
- package/infrastructure/pipes/CreateDtoPipe.js.map +1 -1
- package/infrastructure/repositories/CrudRepository.d.ts +93 -5
- package/infrastructure/repositories/CrudRepository.js +91 -7
- package/infrastructure/repositories/CrudRepository.js.map +1 -1
- package/infrastructure/tests/ModelTest.test.js +23 -0
- package/infrastructure/tests/ModelTest.test.js.map +1 -1
- package/infrastructure/tests/app/services/ArticleService.d.ts +4 -1
- package/infrastructure/tests/app/services/ArticleService.js +3 -1
- package/infrastructure/tests/app/services/ArticleService.js.map +1 -1
- package/infrastructure/tests/app/services/CommentService.d.ts +4 -1
- package/infrastructure/tests/app/services/CommentService.js +3 -1
- package/infrastructure/tests/app/services/CommentService.js.map +1 -1
- package/infrastructure/tests/app/services/FileService.d.ts +4 -1
- package/infrastructure/tests/app/services/FileService.js +3 -1
- package/infrastructure/tests/app/services/FileService.js.map +1 -1
- package/infrastructure/tests/app/services/ImageService.d.ts +4 -1
- package/infrastructure/tests/app/services/ImageService.js +3 -1
- package/infrastructure/tests/app/services/ImageService.js.map +1 -1
- package/infrastructure/tests/app/services/TagService.d.ts +4 -1
- package/infrastructure/tests/app/services/TagService.js +3 -1
- package/infrastructure/tests/app/services/TagService.js.map +1 -1
- package/infrastructure/tests/app/services/UserService.d.ts +4 -1
- package/infrastructure/tests/app/services/UserService.js +3 -1
- package/infrastructure/tests/app/services/UserService.js.map +1 -1
- package/infrastructure/tests/bootstrap.js +1 -1
- package/infrastructure/tests/bootstrap.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/usecases/base/SearchQuery.d.ts +12 -0
- package/usecases/base/SearchQuery.js +18 -0
- package/usecases/base/SearchQuery.js.map +1 -1
- package/usecases/helpers/DataMapper.js +6 -0
- package/usecases/helpers/DataMapper.js.map +1 -1
- package/usecases/helpers/ValidationHelper.d.ts +27 -0
- package/usecases/helpers/ValidationHelper.js +33 -0
- package/usecases/helpers/ValidationHelper.js.map +1 -1
- package/usecases/interfaces/ICrudRepository.d.ts +4 -3
- package/usecases/interfaces/IManualSchema.d.ts +4 -0
- package/usecases/interfaces/ISaveManager.d.ts +2 -2
- package/usecases/services/CrudService.d.ts +40 -2
- package/usecases/services/CrudService.js +93 -4
- package/usecases/services/CrudService.js.map +1 -1
- package/usecases/services/ReadService.d.ts +31 -0
- package/usecases/services/ReadService.js +32 -0
- package/usecases/services/ReadService.js.map +1 -1
- package/usecases/validators/Validator.js +1 -0
- package/usecases/validators/Validator.js.map +1 -1
|
@@ -12,9 +12,11 @@ class QueryAdapterTypeORM {
|
|
|
12
12
|
static prepare(dbRepository, dbQuery, searchQuery, eagerLoading = true) {
|
|
13
13
|
var _a, _b;
|
|
14
14
|
const prefix = ((_b = (_a = dbQuery.expressionMap) === null || _a === void 0 ? void 0 : _a.mainAlias) === null || _b === void 0 ? void 0 : _b.name) || '';
|
|
15
|
+
// Include soft deleted entities
|
|
15
16
|
if (searchQuery.isWithDeleted()) {
|
|
16
17
|
dbQuery.withDeleted();
|
|
17
18
|
}
|
|
19
|
+
// Get select and relations from search schema
|
|
18
20
|
let select = searchQuery.getSelect();
|
|
19
21
|
if (searchQuery.getExcludeSelect()) {
|
|
20
22
|
select = dbRepository.metadata.columns
|
|
@@ -24,18 +26,22 @@ class QueryAdapterTypeORM {
|
|
|
24
26
|
if (select) {
|
|
25
27
|
dbQuery.select(select.map(name => `${prefix}.${name}`));
|
|
26
28
|
}
|
|
29
|
+
// Find relations
|
|
27
30
|
if (searchQuery.getWith()) {
|
|
28
31
|
this.prepareRelations(dbQuery, searchQuery.getWith(), prefix, dbRepository.target, searchQuery.getShortAliasesAreUsed(), eagerLoading);
|
|
29
32
|
}
|
|
33
|
+
// Condition
|
|
30
34
|
if (searchQuery.getWhere()) {
|
|
31
35
|
dbQuery.andWhere(ConditionHelperTypeORM_1.ConditionHelperTypeORM.toTypeOrm(searchQuery.getWhere(), dbQuery, dbRepository.target));
|
|
32
36
|
}
|
|
37
|
+
// Order
|
|
33
38
|
if (searchQuery.getOrderBy()) {
|
|
34
39
|
dbQuery.orderBy(Object.keys(searchQuery.getOrderBy()).reduce((obj, key) => {
|
|
35
40
|
obj[key] = searchQuery.getOrderBy()[key].toUpperCase();
|
|
36
41
|
return obj;
|
|
37
42
|
}, {}));
|
|
38
43
|
}
|
|
44
|
+
// Limit & offset
|
|
39
45
|
if (searchQuery.getLimit()) {
|
|
40
46
|
dbQuery.limit(searchQuery.getLimit());
|
|
41
47
|
}
|
|
@@ -50,10 +56,13 @@ class QueryAdapterTypeORM {
|
|
|
50
56
|
const pathItems = path.split('.');
|
|
51
57
|
if (pathItems.length === 1) {
|
|
52
58
|
const relationName = pathItems.shift();
|
|
59
|
+
// Create query
|
|
53
60
|
const searchQuery = new SearchQuery_1.default();
|
|
61
|
+
// Add select for query from relations config
|
|
54
62
|
if (Array.isArray(relations[path].select)) {
|
|
55
63
|
searchQuery.select(relations[path].select);
|
|
56
64
|
}
|
|
65
|
+
// Sub relations
|
|
57
66
|
const subRelationNames = relationPaths
|
|
58
67
|
.filter(value => value.startsWith(relationName + '.'))
|
|
59
68
|
.reduce((obj, value) => {
|
|
@@ -71,9 +80,11 @@ class QueryAdapterTypeORM {
|
|
|
71
80
|
const dbQuery = dbRepository.manager
|
|
72
81
|
.getRepository((0, TableFromModel_1.getTableFromModel)(relationClass))
|
|
73
82
|
.createQueryBuilder(searchQuery.getAlias());
|
|
83
|
+
// Execute
|
|
74
84
|
switch (options.type) {
|
|
75
|
-
case 'OneToMany':
|
|
85
|
+
case 'OneToMany': // user.images
|
|
76
86
|
const relationClassOptions = (0, BaseField_1.getMetaFields)(relationClass);
|
|
87
|
+
// Find inverse field name
|
|
77
88
|
const inverseFieldNamesObject = relationClassOptions
|
|
78
89
|
.reduce((obj, fieldName) => (Object.assign(Object.assign({}, obj), { [fieldName]: fieldName })), {});
|
|
79
90
|
const inverseFieldName = typeof options.inverseSide === 'string'
|
|
@@ -86,30 +97,37 @@ class QueryAdapterTypeORM {
|
|
|
86
97
|
if (!inverseIdFieldName) {
|
|
87
98
|
throw new Error('Not found id field for relation: ' + relationName);
|
|
88
99
|
}
|
|
100
|
+
// Where
|
|
89
101
|
const rootIds = records.map(record => record[rootPrimaryKey]).filter(Boolean);
|
|
90
102
|
searchQuery.where(['in', inverseIdFieldName, rootIds]);
|
|
103
|
+
// Execute
|
|
91
104
|
QueryAdapterTypeORM.prepare(dbRepository, dbQuery, searchQuery, true);
|
|
92
105
|
const rows = await dbQuery.getMany();
|
|
93
106
|
let models = rows.map(row => DataMapper_1.DataMapper.create(relationClass, row));
|
|
94
107
|
models = await QueryAdapterTypeORM.loadRelationsWithoutJoin(relationClass, dbRepository, models, searchQuery.getWithNoJoin());
|
|
108
|
+
// Populate
|
|
95
109
|
records = records.map(record => {
|
|
96
110
|
record[relationName] = models.filter(model => model[inverseIdFieldName] === record[rootPrimaryKey]);
|
|
97
111
|
return record;
|
|
98
112
|
});
|
|
99
113
|
break;
|
|
100
|
-
case 'ManyToOne':
|
|
114
|
+
case 'ManyToOne': // user.image
|
|
115
|
+
// Find field with id
|
|
101
116
|
const idField = (0, RelationField_1.getMetaRelationIdFieldKey)(MetaClass, relationName);
|
|
102
117
|
if (!idField) {
|
|
103
118
|
throw new Error('Not found id field for relation: ' + relationName);
|
|
104
119
|
}
|
|
105
120
|
const relationIds = records.map(record => record[idField]).filter(Boolean);
|
|
106
121
|
if (relationIds.length > 0) {
|
|
122
|
+
// Where
|
|
107
123
|
const subRelationPrimaryKey = (0, BaseField_1.getMetaPrimaryKey)(relationClass);
|
|
108
124
|
searchQuery.where(['in', subRelationPrimaryKey, relationIds]);
|
|
125
|
+
// Execute
|
|
109
126
|
QueryAdapterTypeORM.prepare(dbRepository, dbQuery, searchQuery, true);
|
|
110
127
|
const rows = await dbQuery.getMany();
|
|
111
128
|
let models = rows.map(row => DataMapper_1.DataMapper.create(relationClass, row));
|
|
112
129
|
models = await QueryAdapterTypeORM.loadRelationsWithoutJoin(relationClass, dbRepository, models, searchQuery.getWithNoJoin());
|
|
130
|
+
// Populate
|
|
113
131
|
const indexedModels = (0, lodash_1.keyBy)(models, subRelationPrimaryKey);
|
|
114
132
|
records = records.map(record => {
|
|
115
133
|
record[relationName] = indexedModels[record[idField]] || null;
|
|
@@ -118,6 +136,7 @@ class QueryAdapterTypeORM {
|
|
|
118
136
|
}
|
|
119
137
|
break;
|
|
120
138
|
default:
|
|
139
|
+
// TODO Implement ManyMany relation type
|
|
121
140
|
throw new Error('This relation type is not implement for load relations without join, relation: ' + relationName);
|
|
122
141
|
}
|
|
123
142
|
}
|
|
@@ -125,13 +144,17 @@ class QueryAdapterTypeORM {
|
|
|
125
144
|
return records;
|
|
126
145
|
}
|
|
127
146
|
static prepareRelations(dbQuery, relationsWithAliases, rootPrefix, rootClass, useShortAliases = false, eagerLoading = true) {
|
|
147
|
+
// Normalize relations: a.b.c -> a, a.b, a.b.c
|
|
128
148
|
const relationToAliasMap = {};
|
|
129
149
|
const relations = [];
|
|
130
150
|
relationsWithAliases.forEach(relationWithAlias => {
|
|
151
|
+
// Add root prefix
|
|
131
152
|
relationWithAlias = rootPrefix + '.' + relationWithAlias;
|
|
153
|
+
// Store alias
|
|
132
154
|
const [relation, alias] = relationWithAlias.split(' ');
|
|
133
155
|
relationToAliasMap[relation] = alias || SearchQuery_1.default.getRelationAlias(relation, useShortAliases);
|
|
134
156
|
relations.push(relation);
|
|
157
|
+
// Store intermediate relations
|
|
135
158
|
let path;
|
|
136
159
|
relation.split('.').forEach(name => {
|
|
137
160
|
path = [path, name].filter(Boolean).join('.');
|
|
@@ -149,6 +172,7 @@ class QueryAdapterTypeORM {
|
|
|
149
172
|
relations
|
|
150
173
|
.sort()
|
|
151
174
|
.forEach(path => {
|
|
175
|
+
// Separate: aaa.bbb.ccc -> aaa.bbb + ccc
|
|
152
176
|
const parentPath = path.split('.').slice(0, -1).join('.');
|
|
153
177
|
const relationName = path.split('.').slice(-1).join('.');
|
|
154
178
|
const options = (0, BaseField_1.getFieldOptions)(classesMap[parentPath], relationName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryAdapterTypeORM.js","sourceRoot":"","sources":["../../../src/infrastructure/adapters/QueryAdapterTypeORM.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AAGvC,sFAAiF;AACjF,8DAIwC;AACxC,iEAA0D;AAC1D,kEAA6D;AAC7D,iEAA+D;AAC/D,sEAA6E;AAE7E,MAAa,mBAAmB;IAC5B,MAAM,CAAC,OAAO,CACV,YAA6B,EAC7B,OAAgC,EAChC,WAA6B,EAC7B,eAAwB,IAAI;;QAE5B,MAAM,MAAM,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,SAAS,0CAAE,IAAI,KAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryAdapterTypeORM.js","sourceRoot":"","sources":["../../../src/infrastructure/adapters/QueryAdapterTypeORM.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ exports.default = {
|
|
|
20
20
|
password: process.env.APP_DATABASE_PASSWORD,
|
|
21
21
|
synchronize: false,
|
|
22
22
|
migrationsRun: false,
|
|
23
|
-
logging: ['schema', 'warn', 'error', 'migration'],
|
|
23
|
+
logging: ['schema', 'warn', 'error', 'migration' /*, 'query'/**/],
|
|
24
24
|
namingStrategy: new DatabaseNamingStrategy_1.DatabaseNamingStrategy(),
|
|
25
25
|
},
|
|
26
26
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/base/config.ts"],"names":[],"mappings":";;AAAA,2DAA6E;AAE7E,0DAAoD;AACpD,6DAAwD;AACxD,4CAAuC;AAEvC,8EAAyE;AAEzE,kBAAe;IACX,UAAU,EAAE,qBAAS;IACrB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACjD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,WAAW,EAAE,KAAK;YAClB,aAAa,EAAE,KAAK;YACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/base/config.ts"],"names":[],"mappings":";;AAAA,2DAA6E;AAE7E,0DAAoD;AACpD,6DAAwD;AACxD,4CAAuC;AAEvC,8EAAyE;AAEzE,kBAAe;IACX,UAAU,EAAE,qBAAS;IACrB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACjD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,WAAW,EAAE,KAAK;YAClB,aAAa,EAAE,KAAK;YACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAA,eAAe,CAAC;YAChE,cAAc,EAAE,IAAI,+CAAsB,EAAE;SAClB;KACZ,CAAA;IACtB,MAAM,EAAE,CAAC,MAAwB,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE;YACL,4BAAa,CAAC,OAAO,CAAC,gCACf,MAAM,CAAC,QAAQ,KAClB,QAAQ,EAAE,2BAAY,CAAC,WAAW,EAAE,GACf,CAAC;YAC1B,MAAM,CAAC,MAAM,IAAI,4BAAY,CAAC,OAAO,CAAC;gBAClC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG;gBACtB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe;aACxE,CAAC;SACL,CAAC,MAAM,CAAC,OAAO,CAAC;KACpB,CAAC;CACL,CAAC"}
|
|
@@ -17,13 +17,13 @@ class ConsoleApplication extends BaseApplication_1.BaseApplication {
|
|
|
17
17
|
async start() {
|
|
18
18
|
await this.init();
|
|
19
19
|
this._app = await core_1.NestFactory.createApplicationContext(this._moduleClass, {
|
|
20
|
-
logger: ['warn', 'error'],
|
|
20
|
+
logger: ['warn', 'error'], // only errors
|
|
21
21
|
});
|
|
22
22
|
try {
|
|
23
23
|
await this._app.select(nestjs_command_1.CommandModule).get(nestjs_command_1.CommandService).exec();
|
|
24
24
|
}
|
|
25
25
|
catch (error) {
|
|
26
|
-
console.error(error);
|
|
26
|
+
console.error(error); // eslint-disable-line no-console
|
|
27
27
|
}
|
|
28
28
|
await this._app.close();
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleApplication.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/console/ConsoleApplication.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,mDAA6D;AAC7D,wDAAmD;AACnD,4CAAuC;AAEvC,MAAa,kBAAmB,SAAQ,iCAAe;IAKnD,YAAY,WAAW,GAAG,qBAAS;QAC/B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;IAES,OAAO;QACb,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QAE7B,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,IAAI,CAAC,IAAI,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,YAAY,EAAE;YACtE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ConsoleApplication.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/console/ConsoleApplication.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,mDAA6D;AAC7D,wDAAmD;AACnD,4CAAuC;AAEvC,MAAa,kBAAmB,SAAQ,iCAAe;IAKnD,YAAY,WAAW,GAAG,qBAAS;QAC/B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;IAES,OAAO;QACb,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QAE7B,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,IAAI,CAAC,IAAI,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,YAAY,EAAE;YACtE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc;SAC5C,CAAC,CAAC;QAEH,IAAI;YACA,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,8BAAa,CAAC,CAAC,GAAG,CAAC,+BAAc,CAAC,CAAC,IAAI,EAAE,CAAC;SACpE;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,iCAAiC;SAC1D;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACJ;AAhCD,gDAgCC"}
|
|
@@ -7,6 +7,7 @@ const EntityCodeGenerateCommand_1 = require("../../commands/entity-generator/Ent
|
|
|
7
7
|
const MigrateCommand_1 = require("../../commands/MigrateCommand");
|
|
8
8
|
const nestjs_command_1 = require("nestjs-command");
|
|
9
9
|
const isMigrateCommand = !!(process.argv || []).find(arg => /^migrate/.exec(arg));
|
|
10
|
+
// search migrations in modules and subModules
|
|
10
11
|
const collectMigrations = (modulePath, migrations = []) => {
|
|
11
12
|
fs.readdirSync(modulePath).forEach(moduleName => {
|
|
12
13
|
migrations.push(path.join(modulePath, `${moduleName}/infrastructure/migrations/*{.ts,.js}`));
|
|
@@ -19,7 +20,9 @@ const collectMigrations = (modulePath, migrations = []) => {
|
|
|
19
20
|
};
|
|
20
21
|
exports.default = Object.assign(Object.assign({}, config_1.default), { config: () => {
|
|
21
22
|
const config = config_1.default.config();
|
|
23
|
+
// For deployment to use files in dist directory.
|
|
22
24
|
const envRootDir = process.env.APP_ENVIRONMENT === 'dev' ? 'src' : 'dist';
|
|
25
|
+
// If CLI_PATH is specified then use directory from it.
|
|
23
26
|
const migrationsRootDir = process.env.CLI_PATH && path.dirname(process.env.CLI_PATH)
|
|
24
27
|
? path.dirname(process.env.CLI_PATH).split(path.sep).find(dir => !dir.includes('.'))
|
|
25
28
|
: envRootDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/console/config.ts"],"names":[],"mappings":";;AACA,6BAA6B;AAC7B,8BAA8B;AAC9B,2CAAwC;AAExC,yGAAoG;AACpG,kEAA6D;AAC7D,mDAA6C;AAE7C,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/console/config.ts"],"names":[],"mappings":";;AACA,6BAA6B;AAC7B,8BAA8B;AAC9B,2CAAwC;AAExC,yGAAoG;AACpG,kEAA6D;AAC7D,mDAA6C;AAE7C,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAElF,8CAA8C;AAC9C,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,aAAuB,EAAE,EAAE,EAAE;IACxE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC5C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,UAAU,uCAAuC,CAAC,CAAC,CAAC;QAE7F,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,UAAU,UAAU,CAAC,CAAC;QACxE,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YACjC,iBAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;SACnD;IACL,CAAC,CAAC,CAAA;IACF,OAAO,UAAU,CAAC;AACtB,CAAC,CAAA;AAED,kDACO,gBAAU,KACb,MAAM,EAAE,GAAG,EAAE;QACT,MAAM,MAAM,GAAG,gBAAU,CAAC,MAAM,EAAE,CAAC;QAEnC,iDAAiD;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;QAE1E,uDAAuD;QACvD,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAChF,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACpF,CAAC,CAAC,UAAU,CAAC;QAEjB,OAAO,gCACA,MAAM,KACT,QAAQ,EAAE,gCACH,MAAM,CAAC,QAAQ,KAClB,UAAU,EAAE,gBAAgB;oBACxB,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;oBACtC,CAAC,CAAC,EAAE,EACR,mBAAmB,EAAE,YAAY,GACP,GACN,CAAC;IACjC,CAAC,EACD,MAAM,EAAE,CAAC,MAA+B,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,gBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,uCACO,MAAM,KACT,OAAO,EAAE;gBACL,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO;gBAClB,8BAAa;aAChB,EACD,SAAS,EAAE;gBACP,qDAAyB;gBACzB,+BAAc;aACjB,IACH;IACN,CAAC,IACH"}
|
|
@@ -28,6 +28,7 @@ class RestApplication extends BaseApplication_1.BaseApplication {
|
|
|
28
28
|
'Authorization',
|
|
29
29
|
'Admin-Authorization',
|
|
30
30
|
'X-CSRF-Token',
|
|
31
|
+
// For file PUT upload
|
|
31
32
|
'If-None-Match',
|
|
32
33
|
'If-Modified-Since',
|
|
33
34
|
'Cache-Control',
|
|
@@ -43,10 +44,12 @@ class RestApplication extends BaseApplication_1.BaseApplication {
|
|
|
43
44
|
] }, custom === null || custom === void 0 ? void 0 : custom.cors) });
|
|
44
45
|
}
|
|
45
46
|
initSwagger() {
|
|
47
|
+
// Versioning
|
|
46
48
|
this._app.setGlobalPrefix('/api/v1');
|
|
47
49
|
this._app.enableVersioning({
|
|
48
50
|
type: common_1.VersioningType.URI,
|
|
49
51
|
});
|
|
52
|
+
// Swagger config
|
|
50
53
|
const swaggerConfig = new swagger_1.DocumentBuilder()
|
|
51
54
|
.setTitle(this._config.title || 'Application')
|
|
52
55
|
.setDescription('Документация REST API')
|
|
@@ -56,6 +59,7 @@ class RestApplication extends BaseApplication_1.BaseApplication {
|
|
|
56
59
|
swagger_1.SwaggerModule.setup('/api/docs', this._app, document);
|
|
57
60
|
}
|
|
58
61
|
initCors() {
|
|
62
|
+
// Cors
|
|
59
63
|
const origin = [];
|
|
60
64
|
(this._config.cors.allowDomains || []).forEach(domain => {
|
|
61
65
|
if (domain.indexOf('://') !== -1) {
|
|
@@ -74,9 +78,11 @@ class RestApplication extends BaseApplication_1.BaseApplication {
|
|
|
74
78
|
});
|
|
75
79
|
}
|
|
76
80
|
initPipes() {
|
|
81
|
+
// Validation
|
|
77
82
|
this._app.useGlobalPipes(new CreateDtoPipe_1.CreateDtoPipe());
|
|
78
83
|
}
|
|
79
84
|
initFilters() {
|
|
85
|
+
// Validation
|
|
80
86
|
this._app.useGlobalFilters(new ValidationExceptionFilter_1.ValidationExceptionFilter());
|
|
81
87
|
this._app.useGlobalFilters(new UserExceptionFilter_1.UserExceptionFilter());
|
|
82
88
|
}
|
|
@@ -113,6 +119,7 @@ class RestApplication extends BaseApplication_1.BaseApplication {
|
|
|
113
119
|
}
|
|
114
120
|
async start() {
|
|
115
121
|
await this.init();
|
|
122
|
+
// Start application
|
|
116
123
|
const port = parseInt(process.env.PORT, 10);
|
|
117
124
|
await this._app.listen(port, () => console.log(`Server started http://localhost:${port}`));
|
|
118
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestApplication.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/rest/RestApplication.ts"],"names":[],"mappings":";;;AAAA,uCAAoD;AACpD,6CAA6C;AAC7C,6CAA+D;AAC/D,2CAA8C;AAC9C,mEAA8D;AAC9D,yDAAoD;AAEpD,6DAAwD;AACxD,uFAAkF;AAClF,2EAAsE;AACtE,wDAAmD;AACnD,6DAAwD;AACxD,4CAAuC;AAEvC,MAAa,eAAgB,SAAQ,iCAAe;IAMhD,YAAY,WAAW,GAAG,qBAAS;QAC/B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;IAES,UAAU;QAChB,MAAM,MAAM,GAAG,2BAAY,CAAC,SAAS,CAAuB,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/E,IAAI,CAAC,OAAO,iCACR,gBAAgB,EAAE,MAAM,IACrB,MAAM,KACT,IAAI,kBACA,YAAY,EAAE;oBACV,QAAQ;oBACR,kBAAkB;oBAClB,cAAc;oBACd,QAAQ;oBACR,eAAe;oBACf,qBAAqB;oBACrB,cAAc;
|
|
1
|
+
{"version":3,"file":"RestApplication.js","sourceRoot":"","sources":["../../../../src/infrastructure/applications/rest/RestApplication.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
import { HttpStatus } from '@nestjs/common';
|
|
2
|
+
/**
|
|
3
|
+
* Defines custom exception, when server action fails during execution.
|
|
4
|
+
* By default, exception set status code as 'Internal Server Error'.
|
|
5
|
+
*
|
|
6
|
+
* @example Request to remove entity with exist relations will fail.
|
|
7
|
+
*/
|
|
2
8
|
export declare class RequestExecutionException {
|
|
3
9
|
message: any;
|
|
4
10
|
status: HttpStatus;
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RequestExecutionException = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
|
+
/**
|
|
6
|
+
* Defines custom exception, when server action fails during execution.
|
|
7
|
+
* By default, exception set status code as 'Internal Server Error'.
|
|
8
|
+
*
|
|
9
|
+
* @example Request to remove entity with exist relations will fail.
|
|
10
|
+
*/
|
|
5
11
|
class RequestExecutionException {
|
|
6
12
|
constructor(message) {
|
|
7
13
|
this.status = common_1.HttpStatus.INTERNAL_SERVER_ERROR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestExecutionException.js","sourceRoot":"","sources":["../../../../../src/infrastructure/applications/rest/exceptions/RequestExecutionException.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;
|
|
1
|
+
{"version":3,"file":"RequestExecutionException.js","sourceRoot":"","sources":["../../../../../src/infrastructure/applications/rest/exceptions/RequestExecutionException.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAE1C;;;;;GAKG;AACH,MAAa,yBAAyB;IAKlC,YAAY,OAAe;QAFpB,WAAM,GAAG,mBAAU,CAAC,qBAAqB,CAAC;QAG7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAhBD,8DAgBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrateCommand.js","sourceRoot":"","sources":["../../../src/infrastructure/commands/MigrateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,2CAAkD;AAClD,gDAA2C;AAC3C,yCAAoC;AACpC,iDAAqF;AACrF,wGAAmG;AACnG,gEAA2D;AAC3D,iFAA4E;AAE5E,qDAAyB,CAAC,SAAS,CAAC,eAAe,GAAG,KAAK,WAAW,UAA+B;IACjG,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,GAAG,mBAAQ,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC7F,MAAM,mBAAmB,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,CAAC,MAAM,IAAA,2DAA4B,EAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACzI,OAAO,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,IAAA,0BAAgB,EAAqB,cAAc,CAAC,CAAC,CAAC;AAC3G,CAAC,CAAA;AAGM,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YAEY,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAElC,CAAC;IAMK,AAAN,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YAChC,WAAW,EAAE,MAAM;SACtB,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACpC,WAAW,EAAE,MAAM;SACtB,CAAC,CAAC;IACP,CAAC;IAMK,AAAN,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;IAC3C,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAOP,IAAY;QAEhB,MAAM,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,QAAQ;QACV,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;CAEJ,CAAA;AAjDS;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,gBAAgB;KAC7B,CAAC;;;;2CAMD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,uBAAuB;KACpC,CAAC;;;;0CAKD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,sBAAsB;KACnC,CAAC;;;;0CAGD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,0BAA0B;QACnC,QAAQ,EAAE,iCAAiC;KAC9C,CAAC;IAEG,WAAA,IAAA,2BAAU,EAAC;QACR,IAAI,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"MigrateCommand.js","sourceRoot":"","sources":["../../../src/infrastructure/commands/MigrateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,2CAAkD;AAClD,gDAA2C;AAC3C,yCAAoC;AACpC,iDAAqF;AACrF,wGAAmG;AACnG,gEAA2D;AAC3D,iFAA4E;AAE5E,qDAAyB,CAAC,SAAS,CAAC,eAAe,GAAG,KAAK,WAAW,UAA+B;IACjG,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,GAAG,mBAAQ,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC7F,MAAM,mBAAmB,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,CAAC,MAAM,IAAA,2DAA4B,EAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACzI,OAAO,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,IAAA,0BAAgB,EAAqB,cAAc,CAAC,CAAC,CAAC;AAC3G,CAAC,CAAA;AAGM,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YAEY,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAElC,CAAC;IAMK,AAAN,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YAChC,WAAW,EAAE,MAAM;SACtB,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACpC,WAAW,EAAE,MAAM;SACtB,CAAC,CAAC;IACP,CAAC;IAMK,AAAN,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;IAC3C,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAOP,IAAY;QAEhB,MAAM,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,QAAQ;QACV,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;CAEJ,CAAA;AAjDS;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,gBAAgB;KAC7B,CAAC;;;;2CAMD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,uBAAuB;KACpC,CAAC;;;;0CAKD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,sBAAsB;KACnC,CAAC;;;;0CAGD;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,0BAA0B;QACnC,QAAQ,EAAE,iCAAiC;KAC9C,CAAC;IAEG,WAAA,IAAA,2BAAU,EAAC;QACR,IAAI,EAAE,MAAM;QACZ,aAAa;QACb,QAAQ,EAAE,qBAAqB;QAC/B,IAAI,EAAE,QAAQ;KACjB,CAAC,CAAA;;;;+CAIL;AAMK;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,kBAAkB;QAC3B,QAAQ,EAAE,0CAA0C;KACvD,CAAC;;;;8CAGD;AA1DQ,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,eAAM,EAAC,oBAAU,CAAC,CAAA;qCACC,oBAAU;GAHzB,cAAc,CA4D1B;AA5DY,wCAAc"}
|
|
@@ -112,14 +112,17 @@ async function dbml2code(path) {
|
|
|
112
112
|
if (!fs.existsSync(path)) {
|
|
113
113
|
throw new Error('Not found file: ' + path);
|
|
114
114
|
}
|
|
115
|
+
// Get source root directory
|
|
115
116
|
const cliConfiguration = await (0, load_configuration_1.loadConfiguration)();
|
|
116
117
|
const sourceRoot = (0, path_1.join)(process.cwd(), cliConfiguration.sourceRoot);
|
|
117
118
|
const dbmlRaw = fs.readFileSync(path, 'utf-8');
|
|
118
119
|
const dbmlJson = JSON.parse(core_1.exporter.export(dbmlRaw, 'json'));
|
|
120
|
+
//Связи ManyToMany, для которых уже добавлен декоратор JoinTable
|
|
119
121
|
const relationsWithJoin = [];
|
|
120
122
|
const manyToManyTables = findManyToManyTables(dbmlJson);
|
|
121
123
|
const modules = findModules(Object.values(dbmlJson.tables));
|
|
122
124
|
modules.forEach((moduleName) => {
|
|
125
|
+
// Create directories
|
|
123
126
|
[
|
|
124
127
|
'',
|
|
125
128
|
'domain',
|
|
@@ -133,6 +136,7 @@ async function dbml2code(path) {
|
|
|
133
136
|
}
|
|
134
137
|
});
|
|
135
138
|
Object.values(dbmlJson.tables).forEach((table) => {
|
|
139
|
+
//Таблица есть в текущем модуле и не является реализацией ManyToMany связи
|
|
136
140
|
if (!table.name.startsWith(moduleName) || manyToManyTables.includes(table)) {
|
|
137
141
|
return;
|
|
138
142
|
}
|
|
@@ -146,8 +150,10 @@ async function dbml2code(path) {
|
|
|
146
150
|
table.fieldIds.forEach(fieldId => {
|
|
147
151
|
const fieldName = dbmlJson.fields[fieldId].name;
|
|
148
152
|
const fieldLabel = dbmlJson.fields[fieldId].note || '';
|
|
153
|
+
// Nullable
|
|
149
154
|
const isNullable = dbmlJson.fields[fieldId].not_null === false;
|
|
150
155
|
let isVirtualField = false;
|
|
156
|
+
//Check relations
|
|
151
157
|
if (dbmlJson.fields[fieldId].endpointIds.length > 0) {
|
|
152
158
|
const fieldLeft = dbmlJson.fields[fieldId];
|
|
153
159
|
fieldLeft.endpointIds.forEach(endpointId => {
|
|
@@ -185,7 +191,9 @@ async function dbml2code(path) {
|
|
|
185
191
|
if (isVirtualField && !dbmlJson.fields[fieldId].pk) {
|
|
186
192
|
return;
|
|
187
193
|
}
|
|
194
|
+
// Field type
|
|
188
195
|
const fieldType = getFieldType(fieldName, dbmlJson.fields[fieldId].type.type_name, dbmlJson.fields[fieldId].pk);
|
|
196
|
+
// Js type
|
|
189
197
|
const fieldJsType = getFieldJsType(fieldType);
|
|
190
198
|
const decoratorName = (0, lodash_1.upperFirst)(fieldType) + 'Field';
|
|
191
199
|
importedFields.push(decoratorName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbml2code.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/dbml/dbml2code.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dbml2code.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/dbml/dbml2code.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,10 @@ const nestjs_command_1 = require("nestjs-command");
|
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
18
|
const EntityCodeGenerator_1 = require("./EntityCodeGenerator");
|
|
19
19
|
let EntityCodeGenerateCommand = class EntityCodeGenerateCommand {
|
|
20
|
+
/**
|
|
21
|
+
* Example:
|
|
22
|
+
* yarn cli entity:generate entity module
|
|
23
|
+
*/
|
|
20
24
|
async index(entityName, moduleName) {
|
|
21
25
|
if (!entityName || !moduleName) {
|
|
22
26
|
throw new Error('Required parameters are not provided');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityCodeGenerateCommand.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/entity-generator/EntityCodeGenerateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,2CAA0C;AAC1C,+DAA0D;AAInD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;
|
|
1
|
+
{"version":3,"file":"EntityCodeGenerateCommand.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/entity-generator/EntityCodeGenerateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,2CAA0C;AAC1C,+DAA0D;AAInD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAClC;;;OAGG;IAKG,AAAN,KAAK,CAAC,KAAK,CAMH,UAAkB,EAMlB,UAAkB;QAEtB,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SAC3D;QAED,CAAC,IAAI,yCAAmB,CACpB,UAAU,EACV,UAAU,CACb,CAAC,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;CACJ,CAAA;AAvBS;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,2CAA2C;QACpD,QAAQ,EAAE,iEAAiE;KAC9E,CAAC;IAEG,WAAA,IAAA,2BAAU,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,8BAA8B;QACxC,IAAI,EAAE,QAAQ;KACjB,CAAC,CAAA;IAED,WAAA,IAAA,2BAAU,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,6BAA6B;QACvC,IAAI,EAAE,QAAQ;KACjB,CAAC,CAAA;;;;sDAWL;AA/BQ,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAgCrC;AAhCY,8DAAyB"}
|
|
@@ -27,6 +27,7 @@ const templates = {
|
|
|
27
27
|
class EntityCodeGenerator {
|
|
28
28
|
constructor(entityName, moduleName, rootPath = null) {
|
|
29
29
|
this.placeholdersValuesMap = {};
|
|
30
|
+
// set first letter in upper case if it's not
|
|
30
31
|
if (entityName[0].toUpperCase() !== entityName[0]) {
|
|
31
32
|
this.entityName = entityName.charAt(0).toUpperCase() + entityName.slice(1);
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityCodeGenerator.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/entity-generator/EntityCodeGenerator.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,6BAA6B;AAC7B,mCAA+C;AAE/C,MAAM,uBAAuB,GAAG,cAAc,CAAC;AAC/C,MAAM,sBAAsB,GAAG,aAAa,CAAC;AAE7C,MAAM,WAAW,GAAG;IAChB,KAAK,EAAE,oCAAoC;IAC3C,UAAU,EAAE,uDAAuD;IACnE,mBAAmB,EAAE,8CAA8C;IACnE,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,wCAAwC;IACjD,OAAO,EAAE,oCAAoC;IAC7C,SAAS,EAAE,sCAAsC;CACpD,CAAA;AAED,MAAM,SAAS,GAAG;IACd,KAAK,EAAE,mBAAmB;IAC1B,UAAU,EAAE,wBAAwB;IACpC,mBAAmB,EAAE,iCAAiC;IACtD,KAAK,EAAE,mBAAmB;IAC1B,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE,uBAAuB;CACrC,CAAA;AAED,MAAa,mBAAmB;IAQ5B,YACI,UAAkB,EAClB,UAAkB,EAClB,WAAmB,IAAI;QALlB,0BAAqB,GAA2B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"EntityCodeGenerator.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/entity-generator/EntityCodeGenerator.ts"],"names":[],"mappings":"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"}
|