@steroidsjs/nest 1.7.9 → 1.7.11
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/commands/entity-generator/templates/ModelTemplate.txt +1 -1
- package/infrastructure/commands/entity-generator/templates/RepositoryInterfaceTemplate.txt +1 -1
- package/infrastructure/commands/entity-generator/templates/RepositoryTemplate.txt +1 -1
- package/infrastructure/commands/entity-generator/templates/SearchDtoTemplate.txt +1 -1
- package/infrastructure/commands/entity-generator/templates/ServiceTemplate.txt +1 -1
- package/infrastructure/commands/entity-generator/templates/TableTemplate.txt +2 -2
- package/infrastructure/commands/generate/index.js +17 -8
- package/infrastructure/commands/generate/index.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {ICrudRepository} from '@steroidsjs/nest/
|
|
1
|
+
import {ICrudRepository} from '@steroidsjs/nest/usecases/interfaces/ICrudRepository';
|
|
2
2
|
import {%entityName%Model} from '../models/%entityName%Model';
|
|
3
3
|
|
|
4
4
|
export const I%entityName%Repository = 'I%entityName%Repository';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {Repository} from '@steroidsjs/typeorm';
|
|
2
2
|
import {Injectable} from '@nestjs/common';
|
|
3
3
|
import {InjectRepository} from '@steroidsjs/nest-typeorm';
|
|
4
|
-
import {CrudRepository} from '@steroidsjs/nest/
|
|
4
|
+
import {CrudRepository} from '@steroidsjs/nest/infrastructure/repositories/CrudRepository';
|
|
5
5
|
import {%entityName%Model} from '../../domain/models/%entityName%Model';
|
|
6
6
|
import {%entityName%Table} from '../tables/%entityName%Table';
|
|
7
7
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {CrudService} from '@steroidsjs/nest/
|
|
1
|
+
import {CrudService} from '@steroidsjs/nest/usecases/services/CrudService';
|
|
2
2
|
import {%entityName%SearchDto} from '../dtos/%entityName%SearchDto';
|
|
3
3
|
import {%entityName%SaveDto} from '../dtos/%entityName%SaveDto';
|
|
4
4
|
import {%entityName%Model} from '../models/%entityName%Model';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {IDeepPartial} from '@steroidsjs/nest/
|
|
2
|
-
import {TableFromModel} from '@steroidsjs/nest/
|
|
1
|
+
import {IDeepPartial} from '@steroidsjs/nest/usecases/interfaces/IDeepPartial';
|
|
2
|
+
import {TableFromModel} from '@steroidsjs/nest/infrastructure/decorators/TableFromModel';
|
|
3
3
|
import {%entityName%Model} from '../../domain/models/%entityName%Model';
|
|
4
4
|
|
|
5
5
|
@TableFromModel(%entityName%Model, '%tableName%')
|
|
@@ -8,6 +8,7 @@ const fs = require("fs");
|
|
|
8
8
|
const CommandUtils_1 = require("@steroidsjs/typeorm/commands/CommandUtils");
|
|
9
9
|
const formatter_1 = require("@sqltools/formatter");
|
|
10
10
|
const CustomRdbmsSchemaBuilder_1 = require("./CustomRdbmsSchemaBuilder");
|
|
11
|
+
const glob = require("glob");
|
|
11
12
|
const queryParams = (parameters) => {
|
|
12
13
|
if (!parameters || !parameters.length) {
|
|
13
14
|
return '';
|
|
@@ -59,14 +60,22 @@ const generate = async (connection) => {
|
|
|
59
60
|
const moduleDir = (0, path_1.join)(sourceRoot, moduleName);
|
|
60
61
|
const moduleClassPath = (0, path_1.join)(moduleDir, '/infrastructure/' + lodash.upperFirst(moduleName) + 'Module.ts');
|
|
61
62
|
if (fs.existsSync(moduleClassPath)) {
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
const tableFilesPaths = await Promise.resolve(new Promise((resolve, reject) => {
|
|
64
|
+
glob(moduleDir + '/**/tables/*Table{.ts,.js}', (err, matches) => {
|
|
65
|
+
if (err) {
|
|
66
|
+
reject(err);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
resolve(matches);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}));
|
|
73
|
+
for (const tableFilePath of tableFilesPaths) {
|
|
74
|
+
const tableClassName = tableFilePath.split('/').at(-1).replace(/\.ts$/, '');
|
|
66
75
|
const tableName = classesToTablesMap[tableClassName];
|
|
67
76
|
tablesInfo[tableName] = {
|
|
68
77
|
tableClassName,
|
|
69
|
-
|
|
78
|
+
tablePath: tableFilePath,
|
|
70
79
|
};
|
|
71
80
|
}
|
|
72
81
|
}
|
|
@@ -100,13 +109,13 @@ const generate = async (connection) => {
|
|
|
100
109
|
continue;
|
|
101
110
|
}
|
|
102
111
|
const tableClassName = tablesInfo[tableName].tableClassName;
|
|
103
|
-
const
|
|
112
|
+
const tablePath = tablesInfo[tableName].tablePath;
|
|
104
113
|
const tableDeclarationUpQueries = migrationsByTables[tableName].upQueries.filter(query => query.includes('CREATE TABLE'));
|
|
105
114
|
const tableDeclarationDownQueries = migrationsByTables[tableName].downQueries.filter(query => query.includes('DROP TABLE')).reverse();
|
|
106
115
|
if (tableDeclarationUpQueries.length > 0 || tableDeclarationDownQueries.length > 0) {
|
|
107
116
|
const tableDeclarationFileContent = getTemplate(tableClassName, timestamp, tableDeclarationUpQueries, tableDeclarationDownQueries);
|
|
108
117
|
const tableDeclarationFileName = timestamp + '-' + tableClassName + '.ts';
|
|
109
|
-
const tableDeclarationFilePath = (0, path_1.
|
|
118
|
+
const tableDeclarationFilePath = (0, path_1.resolve)(tablePath, '../../migrations', tableDeclarationFileName);
|
|
110
119
|
console.log('info', '\t' + tableDeclarationFilePath);
|
|
111
120
|
await CommandUtils_1.CommandUtils.createFile(tableDeclarationFilePath, tableDeclarationFileContent);
|
|
112
121
|
}
|
|
@@ -116,7 +125,7 @@ const generate = async (connection) => {
|
|
|
116
125
|
if (foreignKeysUpQueries.length > 0 || foreignKeysDownQueries.length > 0) {
|
|
117
126
|
const foreignKeysFileContent = getTemplate(tableClassName, nextTimestamp, foreignKeysUpQueries, foreignKeysDownQueries);
|
|
118
127
|
const foreignKeysFileName = nextTimestamp + '-' + tableClassName + '.ts';
|
|
119
|
-
const foreignKeysFilePath = (0, path_1.
|
|
128
|
+
const foreignKeysFilePath = (0, path_1.resolve)(tablePath, '../../migrations', foreignKeysFileName);
|
|
120
129
|
console.log('info', '\t' + foreignKeysFilePath);
|
|
121
130
|
await CommandUtils_1.CommandUtils.createFile(foreignKeysFilePath, foreignKeysFileContent);
|
|
122
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/generate/index.ts"],"names":[],"mappings":";;;AAAA,iFAA2E;AAC3E,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/infrastructure/commands/generate/index.ts"],"names":[],"mappings":"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"}
|