@asapjs/sequelize 0.3.4 → 0.3.6
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/dto/ExtendableDto.d.ts +6 -1
- package/dist/dto/ExtendableDto.d.ts.map +1 -1
- package/dist/dto/ExtendableDto.js +13 -1
- package/dist/dto/ExtendableDto.js.map +1 -1
- package/dist/sequelize/index.d.ts +1 -0
- package/dist/sequelize/index.d.ts.map +1 -1
- package/dist/sequelize/index.js +23 -7
- package/dist/sequelize/index.js.map +1 -1
- package/dist/types/array.d.ts.map +1 -1
- package/dist/types/array.js +24 -8
- package/dist/types/array.js.map +1 -1
- package/dist/types/dto.d.ts +1 -1
- package/dist/types/dto.d.ts.map +1 -1
- package/dist/types/dto.js +4 -3
- package/dist/types/dto.js.map +1 -1
- package/dist/types/generators/toSwaggerGenerator.d.ts +2 -1
- package/dist/types/generators/toSwaggerGenerator.d.ts.map +1 -1
- package/dist/types/generators/toSwaggerGenerator.js.map +1 -1
- package/dist/types/paging.d.ts.map +1 -1
- package/dist/types/paging.js +26 -10
- package/dist/types/paging.js.map +1 -1
- package/package.json +2 -1
|
@@ -8,15 +8,20 @@ interface DtoMiddlewareReturn {
|
|
|
8
8
|
include?: Includeable[];
|
|
9
9
|
}
|
|
10
10
|
export default class ExtendableDto {
|
|
11
|
+
static isInitlized: boolean;
|
|
12
|
+
init: () => void;
|
|
11
13
|
map: (data: any) => any;
|
|
12
14
|
pagingMap: (data: any) => any;
|
|
13
15
|
middleware: (as?: string | undefined, user?: any, extraAs?: string[] | undefined) => DtoMiddlewareReturn;
|
|
14
|
-
|
|
16
|
+
generateScheme: () => {
|
|
15
17
|
type: string;
|
|
16
18
|
properties: {
|
|
17
19
|
[key: string]: unknown;
|
|
18
20
|
};
|
|
19
21
|
};
|
|
22
|
+
swagger: () => {
|
|
23
|
+
$ref: string;
|
|
24
|
+
};
|
|
20
25
|
}
|
|
21
26
|
export {};
|
|
22
27
|
//# sourceMappingURL=ExtendableDto.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtendableDto.d.ts","sourceRoot":"","sources":["../../src/dto/ExtendableDto.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAW,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ExtendableDto.d.ts","sourceRoot":"","sources":["../../src/dto/ExtendableDto.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAW,MAAM,WAAW,CAAC;AAQ7D,UAAU,mBAAmB;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,WAAW,UAAS;IAEpB,IAAI,aAGT;IAEK,GAAG,SAAU,GAAG,KAAG,GAAG,CAsC3B;IAEK,SAAS,SAAU,GAAG,KAAG,GAAG,CAIjC;IAEK,UAAU,mCAAwB,GAAG,yDAmF1C;IAEK,cAAc;;;;;MAsBnB;IAEK,OAAO;;MAKZ;CACH"}
|
|
@@ -4,8 +4,13 @@ require("reflect-metadata");
|
|
|
4
4
|
const sequelize_1 = require("sequelize");
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
const core_1 = require("@asapjs/core");
|
|
7
|
+
const router_1 = require("@asapjs/router");
|
|
7
8
|
class ExtendableDto {
|
|
8
9
|
constructor() {
|
|
10
|
+
this.init = () => {
|
|
11
|
+
const dtoName = this.constructor.name;
|
|
12
|
+
(0, router_1.addScheme)({ name: dtoName, data: this.generateScheme() });
|
|
13
|
+
};
|
|
9
14
|
this.map = (data) => {
|
|
10
15
|
const types = (0, types_1.getTypesData)(this);
|
|
11
16
|
const properties = Object.assign({}, types);
|
|
@@ -108,7 +113,7 @@ class ExtendableDto {
|
|
|
108
113
|
result.include = include;
|
|
109
114
|
return result;
|
|
110
115
|
};
|
|
111
|
-
this.
|
|
116
|
+
this.generateScheme = () => {
|
|
112
117
|
const types = (0, types_1.getTypesData)(this);
|
|
113
118
|
const data = Object.keys(types).reduce((p, key) => {
|
|
114
119
|
var _a, _b;
|
|
@@ -127,7 +132,14 @@ class ExtendableDto {
|
|
|
127
132
|
properties: data,
|
|
128
133
|
};
|
|
129
134
|
};
|
|
135
|
+
this.swagger = () => {
|
|
136
|
+
const dtoName = this.constructor.name;
|
|
137
|
+
return {
|
|
138
|
+
$ref: (0, router_1.generateSchemeRefWithName)(dtoName),
|
|
139
|
+
};
|
|
140
|
+
};
|
|
130
141
|
}
|
|
131
142
|
}
|
|
132
143
|
exports.default = ExtendableDto;
|
|
144
|
+
ExtendableDto.isInitlized = false;
|
|
133
145
|
//# sourceMappingURL=ExtendableDto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtendableDto.js","sourceRoot":"","sources":["../../src/dto/ExtendableDto.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAG1B,yCAA6D;AAE7D,oCAAwC;AACxC,uCAAsC;
|
|
1
|
+
{"version":3,"file":"ExtendableDto.js","sourceRoot":"","sources":["../../src/dto/ExtendableDto.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import 'reflect-metadata';
|
|
|
3
3
|
export declare const dbInit: (config: SequelizeOptions) => Promise<Sequelize>;
|
|
4
4
|
export declare const loadPath: (path: string, subPath: string) => Promise<void>;
|
|
5
5
|
export declare const addModelsToSequelize: () => Promise<void>;
|
|
6
|
+
export declare const addDtosToSwagger: () => Promise<void>;
|
|
6
7
|
export declare const modelsSync: () => Promise<boolean>;
|
|
7
8
|
export declare const getSequelize: () => Sequelize;
|
|
8
9
|
export declare const initSequelizeModule: (dirname: string) => Promise<Sequelize>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequelize/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKrF,OAAO,kBAAkB,CAAC;AAQ1B,eAAO,MAAM,MAAM,WAAkB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequelize/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKrF,OAAO,kBAAkB,CAAC;AAQ1B,eAAO,MAAM,MAAM,WAAkB,gBAAgB,uBA0CpD,CAAC;AAEF,eAAO,MAAM,QAAQ,SAAgB,MAAM,WAAW,MAAM,kBAa3D,CAAC;AAEF,eAAO,MAAM,oBAAoB,qBAGhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,qBAG5B,CAAC;AAEF,eAAO,MAAM,UAAU,wBAItB,CAAC;AAEF,eAAO,MAAM,YAAY,iBAAmB,CAAC;AAE7C,eAAO,MAAM,mBAAmB,YAAmB,MAAM,KAAG,QAAQ,SAAS,CAM5E,CAAC;AAEF,eAAO,MAAM,YAAY,qBAAiB,CAAC"}
|
package/dist/sequelize/index.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.generateDBML = exports.initSequelizeModule = exports.getSequelize = exports.modelsSync = exports.addModelsToSequelize = exports.loadPath = exports.dbInit = void 0;
|
|
15
|
+
exports.generateDBML = exports.initSequelizeModule = exports.getSequelize = exports.modelsSync = exports.addDtosToSwagger = exports.addModelsToSequelize = exports.loadPath = exports.dbInit = void 0;
|
|
16
16
|
const sequelize_typescript_1 = require("sequelize-typescript");
|
|
17
17
|
const fs_1 = __importDefault(require("fs"));
|
|
18
18
|
const core_1 = require("@asapjs/core");
|
|
@@ -30,18 +30,28 @@ const dbInit = (config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
30
30
|
})
|
|
31
31
|
.catch((err) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
32
|
// if error occured for database is not exist, create it
|
|
33
|
-
if (err.name ==
|
|
33
|
+
if (err.name == 'SequelizeConnectionError' &&
|
|
34
|
+
err.original.code === 'ER_BAD_DB_ERROR' &&
|
|
35
|
+
err.original.sqlMessage.startsWith('Unknown database')) {
|
|
34
36
|
const databaseName = config.database;
|
|
35
37
|
core_1.logger.error(`@sequelize :: Database ${databaseName} has not craeted. Run auto database create process`);
|
|
36
38
|
const temp_config = Object.assign({}, config);
|
|
37
39
|
temp_config.database = undefined;
|
|
38
40
|
// create temp sequelize connection
|
|
39
41
|
const sequelize_temp = new sequelize_typescript_1.Sequelize(temp_config);
|
|
40
|
-
sequelize_temp.authenticate().then(() => {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
sequelize_temp.authenticate().then(() => {
|
|
43
|
+
core_1.logger.info('@sequelize(temp_session) :: Database connected.');
|
|
44
|
+
});
|
|
45
|
+
// if database is not exist, run create database query
|
|
46
|
+
yield sequelize_temp.query(`CREATE DATABASE IF NOT EXISTS \`${databaseName}\`;`).then(() => {
|
|
47
|
+
core_1.logger.info(`@sequelize(temp_session) :: Database ${databaseName} Create Successfully`);
|
|
48
|
+
});
|
|
49
|
+
sequelize_temp.close().then(() => {
|
|
50
|
+
core_1.logger.info(`@sequelize(temp_session) :: Release temp session successfully`);
|
|
51
|
+
});
|
|
52
|
+
sequelize.authenticate().then(() => {
|
|
53
|
+
core_1.logger.info('@sequelize :: Database Reconnect Successfully');
|
|
54
|
+
});
|
|
45
55
|
}
|
|
46
56
|
else {
|
|
47
57
|
core_1.logger.error('@sequelize :: Unable to connect to the database:\n', err);
|
|
@@ -73,6 +83,11 @@ const addModelsToSequelize = () => __awaiter(void 0, void 0, void 0, function* (
|
|
|
73
83
|
core_1.logger.info('@sequelize :: add models to sequelize instance.');
|
|
74
84
|
});
|
|
75
85
|
exports.addModelsToSequelize = addModelsToSequelize;
|
|
86
|
+
const addDtosToSwagger = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
+
yield Promise.all(dtos.map((Dto) => new Dto().init()));
|
|
88
|
+
core_1.logger.info('@sequelize :: add dto to swagger schemas.');
|
|
89
|
+
});
|
|
90
|
+
exports.addDtosToSwagger = addDtosToSwagger;
|
|
76
91
|
const modelsSync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
77
92
|
yield container.sync({ alter: { drop: false } });
|
|
78
93
|
core_1.logger.info('@sequelize :: models sync finished');
|
|
@@ -85,6 +100,7 @@ const initSequelizeModule = (dirname) => __awaiter(void 0, void 0, void 0, funct
|
|
|
85
100
|
const dbContainer = yield (0, exports.dbInit)((0, core_1.getConfig)().db);
|
|
86
101
|
yield (0, exports.loadPath)(dirname, '');
|
|
87
102
|
yield (0, exports.addModelsToSequelize)();
|
|
103
|
+
yield (0, exports.addDtosToSwagger)();
|
|
88
104
|
return dbContainer;
|
|
89
105
|
});
|
|
90
106
|
exports.initSequelizeModule = initSequelizeModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sequelize/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAqF;AACrF,4CAAoB;AAEpB,uCAAiD;AAEjD,4BAA0B;AAE1B,IAAI,SAAS,GAAqB,IAAI,CAAC;AAEvC,MAAM,MAAM,GAAiC,EAAE,CAAC;AAEhD,MAAM,IAAI,GAAU,EAAE,CAAC;AAEhB,MAAM,MAAM,GAAG,CAAO,MAAwB,EAAE,EAAE;IACvD,MAAM,SAAS,GAAG,IAAI,gCAAS,CAAC,MAAM,CAAC,CAAC;IACxC,SAAS,GAAG,SAAS,CAAC;IACtB,SAAS;SACN,YAAY,EAAE;SACd,IAAI,CAAC,GAAG,EAAE;QACT,aAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IACnD,CAAC,CAAC;SACD,KAAK,CAAC,CAAO,GAAG,EAAE,EAAE;QACnB,wDAAwD;QACxD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sequelize/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../src/types/array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAiB,UAAU,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../src/types/array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAiB,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAMvE,eAAO,MAAM,oBAAoB,oMA+B/B,CAAC;AAEH,eAAO,MAAM,mBAAmB,MAAO,GAAG,QAOzC,CAAC;AAEF,QAAA,MAAM,WAAW,iQAId,CAAC;AAEJ,eAAe,WAAW,CAAC"}
|
package/dist/types/array.js
CHANGED
|
@@ -7,20 +7,36 @@ exports.TypeIsArrayFixValue = exports.TypeIsArrayToSwagger = void 0;
|
|
|
7
7
|
const typeGenerator_1 = require("./generators/typeGenerator");
|
|
8
8
|
const isClass_1 = __importDefault(require("../utils/isClass"));
|
|
9
9
|
const toSwaggerGenerator_1 = require("./generators/toSwaggerGenerator");
|
|
10
|
+
const router_1 = require("@asapjs/router");
|
|
10
11
|
exports.TypeIsArrayToSwagger = (0, toSwaggerGenerator_1.toSwaggerGenerator)((options) => {
|
|
11
|
-
var _a
|
|
12
|
-
let items = {};
|
|
12
|
+
var _a;
|
|
13
13
|
const isDto = (0, isClass_1.default)(options);
|
|
14
|
+
const generateScheme = (items) => ({
|
|
15
|
+
type: 'array',
|
|
16
|
+
items,
|
|
17
|
+
});
|
|
14
18
|
if (isDto) {
|
|
15
|
-
|
|
19
|
+
const dto = new options();
|
|
20
|
+
const name = `${dto.constructor.name}_ARRAY`;
|
|
21
|
+
(0, router_1.addScheme)({
|
|
22
|
+
name,
|
|
23
|
+
data: generateScheme(dto.swagger()),
|
|
24
|
+
});
|
|
25
|
+
return {
|
|
26
|
+
$ref: `#/components/schemas/${name}`,
|
|
27
|
+
};
|
|
16
28
|
}
|
|
17
29
|
else {
|
|
18
|
-
|
|
30
|
+
const type = options();
|
|
31
|
+
const name = `TYPE_${type.__name.toUpperCase()}_ARRAY`;
|
|
32
|
+
(0, router_1.addScheme)({
|
|
33
|
+
name,
|
|
34
|
+
data: generateScheme((_a = type.toSwagger) === null || _a === void 0 ? void 0 : _a.call(type)),
|
|
35
|
+
});
|
|
36
|
+
return {
|
|
37
|
+
$ref: `#/components/schemas/${name}`,
|
|
38
|
+
};
|
|
19
39
|
}
|
|
20
|
-
return {
|
|
21
|
-
type: 'array',
|
|
22
|
-
items,
|
|
23
|
-
};
|
|
24
40
|
});
|
|
25
41
|
const TypeIsArrayFixValue = (o) => {
|
|
26
42
|
try {
|
package/dist/types/array.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/types/array.ts"],"names":[],"mappings":";;;;;;AACA,8DAAuE;AACvE,+DAAuC;AAEvC,wEAAqE;
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/types/array.ts"],"names":[],"mappings":";;;;;;AACA,8DAAuE;AACvE,+DAAuC;AAEvC,wEAAqE;AACrE,2CAA2C;AAE9B,QAAA,oBAAoB,GAAG,IAAA,uCAAkB,EAAc,CAAC,OAAO,EAAE,EAAE;;IAC9E,MAAM,KAAK,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,OAAO;QACb,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,GAAG,IAAK,OAAgC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC;QAC7C,IAAA,kBAAS,EAAC;YACR,IAAI;YACJ,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACpC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,wBAAwB,IAAI,EAAE;SACrC,CAAC;KACH;SAAM;QACL,MAAM,IAAI,GAAI,OAA4B,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC;QACvD,IAAA,kBAAS,EAAC;YACR,IAAI;YACJ,IAAI,EAAE,cAAc,CAAC,MAAA,IAAI,CAAC,SAAS,oDAAI,CAAC;SACzC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,wBAAwB,IAAI,EAAE;SACrC,CAAC;KACH;AACH,CAAC,CAAC,CAAC;AAEI,MAAM,mBAAmB,GAAG,CAAC,CAAM,EAAE,EAAE;IAC5C,IAAI;QACF,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,OAAO,CAAC,CAAC;KACV;IAAC,WAAM;QACN,OAAO,CAAC,CAAC;KACV;AACH,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B;AAEF,MAAM,WAAW,GAAG,IAAA,6BAAa,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,GAAG,EAAE,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC;IAC9C,QAAQ,EAAE,2BAAmB;CAC9B,CAAC,CAAC,CAAC;AAEJ,kBAAe,WAAW,CAAC"}
|
package/dist/types/dto.d.ts
CHANGED
package/dist/types/dto.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../src/types/dto.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../src/types/dto.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,OAAO,aAAa,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,wMAW7B,CAAC;AAEH,QAAA,MAAM,SAAS,0SAIZ,CAAC;AAEJ,eAAe,SAAS,CAAC"}
|
package/dist/types/dto.js
CHANGED
|
@@ -5,13 +5,14 @@ const core_1 = require("@asapjs/core");
|
|
|
5
5
|
const toSwaggerGenerator_1 = require("./generators/toSwaggerGenerator");
|
|
6
6
|
const typeGenerator_1 = require("./generators/typeGenerator");
|
|
7
7
|
exports.TypeIsDtoToSwagger = (0, toSwaggerGenerator_1.toSwaggerGenerator)((options) => {
|
|
8
|
-
var _a;
|
|
9
8
|
if (!options) {
|
|
10
9
|
core_1.logger.error(`@asapjs/sequelize :: @TypeIs.DTO - DTO가 지정되지 않았습니다.`);
|
|
11
10
|
process.exit(1);
|
|
12
11
|
}
|
|
13
|
-
const
|
|
14
|
-
return
|
|
12
|
+
const dtoName = new options.dto().constructor.name;
|
|
13
|
+
return {
|
|
14
|
+
$ref: `#/components/schemas/${dtoName}`,
|
|
15
|
+
};
|
|
15
16
|
});
|
|
16
17
|
const TypeIsDto = (0, typeGenerator_1.typeGenerator)((options) => ({
|
|
17
18
|
__name: 'dto',
|
package/dist/types/dto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../src/types/dto.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAEtC,wEAAqE;AACrE,8DAA2D;AAQ9C,QAAA,kBAAkB,GAAG,IAAA,uCAAkB,EAAkB,CAAC,OAAO,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../src/types/dto.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAEtC,wEAAqE;AACrE,8DAA2D;AAQ9C,QAAA,kBAAkB,GAAG,IAAA,uCAAkB,EAAkB,CAAC,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,OAAO,EAAE;QACZ,aAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;IAEnD,OAAO;QACL,IAAI,EAAE,wBAAwB,OAAO,EAAE;KACxC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAA,6BAAa,EAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,MAAM,EAAE,KAAK;IACb,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,EAAE,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,EAAE,CAAC;IAC3D,SAAS,EAAE,GAAG,EAAE,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC;CAC7C,CAAC,CAAC,CAAC;AAEJ,kBAAe,SAAS,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ModelAttributeColumnOptions } from 'sequelize';
|
|
2
2
|
export interface ISwaggerData {
|
|
3
|
-
type
|
|
3
|
+
type?: string;
|
|
4
4
|
format?: string;
|
|
5
5
|
description?: string;
|
|
6
6
|
items?: any;
|
|
7
|
+
$ref?: string;
|
|
7
8
|
}
|
|
8
9
|
export declare const toSwaggerGenerator: <T>(generator: (options?: (T & ModelAttributeColumnOptions<import("sequelize").Model<any, any>>) | undefined) => ISwaggerData) => (options?: (T & ModelAttributeColumnOptions<import("sequelize").Model<any, any>>) | undefined) => ISwaggerData;
|
|
9
10
|
//# sourceMappingURL=toSwaggerGenerator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toSwaggerGenerator.d.ts","sourceRoot":"","sources":["../../../src/types/generators/toSwaggerGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"toSwaggerGenerator.d.ts","sourceRoot":"","sources":["../../../src/types/generators/toSwaggerGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,kBAAkB,mHAAiE,YAAY,uGAAZ,YACrF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toSwaggerGenerator.js","sourceRoot":"","sources":["../../../src/types/generators/toSwaggerGenerator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"toSwaggerGenerator.js","sourceRoot":"","sources":["../../../src/types/generators/toSwaggerGenerator.ts"],"names":[],"mappings":";;;AAUO,MAAM,kBAAkB,GAAG,CAAI,SAAsE,EAAE,EAAE,CAC9G,SAAS,CAAC;AADC,QAAA,kBAAkB,sBACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paging.d.ts","sourceRoot":"","sources":["../../src/types/paging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAiB,UAAU,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"paging.d.ts","sourceRoot":"","sources":["../../src/types/paging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAiB,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAMvE,eAAO,MAAM,qBAAqB,oMAkEhC,CAAC;AAEH,QAAA,MAAM,YAAY,iQAGf,CAAC;AAEJ,eAAe,YAAY,CAAC"}
|
package/dist/types/paging.js
CHANGED
|
@@ -7,17 +7,11 @@ exports.TypeIsPagingToSwagger = void 0;
|
|
|
7
7
|
const typeGenerator_1 = require("./generators/typeGenerator");
|
|
8
8
|
const isClass_1 = __importDefault(require("../utils/isClass"));
|
|
9
9
|
const toSwaggerGenerator_1 = require("./generators/toSwaggerGenerator");
|
|
10
|
+
const router_1 = require("@asapjs/router");
|
|
10
11
|
exports.TypeIsPagingToSwagger = (0, toSwaggerGenerator_1.toSwaggerGenerator)((options) => {
|
|
11
|
-
var _a
|
|
12
|
-
let items = {};
|
|
12
|
+
var _a;
|
|
13
13
|
const isDto = (0, isClass_1.default)(options);
|
|
14
|
-
|
|
15
|
-
items = new options().swagger();
|
|
16
|
-
}
|
|
17
|
-
else {
|
|
18
|
-
items = (_b = (_a = options()).toSwagger) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
19
|
-
}
|
|
20
|
-
return {
|
|
14
|
+
const generateScheme = (items) => ({
|
|
21
15
|
type: 'object',
|
|
22
16
|
properties: {
|
|
23
17
|
data: {
|
|
@@ -55,7 +49,29 @@ exports.TypeIsPagingToSwagger = (0, toSwaggerGenerator_1.toSwaggerGenerator)((op
|
|
|
55
49
|
description: '전체 레코드 개수',
|
|
56
50
|
},
|
|
57
51
|
},
|
|
58
|
-
};
|
|
52
|
+
});
|
|
53
|
+
if (isDto) {
|
|
54
|
+
const dto = new options();
|
|
55
|
+
const name = `${dto.constructor.name}_PAGING`;
|
|
56
|
+
(0, router_1.addScheme)({
|
|
57
|
+
name,
|
|
58
|
+
data: generateScheme(dto.swagger()),
|
|
59
|
+
});
|
|
60
|
+
return {
|
|
61
|
+
$ref: `#/components/schemas/${name}`,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
const type = options();
|
|
66
|
+
const name = `TYPE_${type.__name.toUpperCase()}_PAGING`;
|
|
67
|
+
(0, router_1.addScheme)({
|
|
68
|
+
name,
|
|
69
|
+
data: generateScheme((_a = type.toSwagger) === null || _a === void 0 ? void 0 : _a.call(type)),
|
|
70
|
+
});
|
|
71
|
+
return {
|
|
72
|
+
$ref: `#/components/schemas/${name}`,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
59
75
|
});
|
|
60
76
|
const TypeIsPaging = (0, typeGenerator_1.typeGenerator)((options) => ({
|
|
61
77
|
__name: 'array',
|
package/dist/types/paging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paging.js","sourceRoot":"","sources":["../../src/types/paging.ts"],"names":[],"mappings":";;;;;;AACA,8DAAuE;AACvE,+DAAuC;AAEvC,wEAAqE;
|
|
1
|
+
{"version":3,"file":"paging.js","sourceRoot":"","sources":["../../src/types/paging.ts"],"names":[],"mappings":";;;;;;AACA,8DAAuE;AACvE,+DAAuC;AAEvC,wEAAqE;AACrE,2CAA2C;AAE9B,QAAA,qBAAqB,GAAG,IAAA,uCAAkB,EAAc,CAAC,OAAO,EAAE,EAAE;;IAC/E,MAAM,KAAK,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,OAAO;gBACb,KAAK;aACN;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,QAAQ;aACtB;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,YAAY;aAC1B;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,QAAQ;aACtB;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,SAAS;gBACjB,WAAW,EAAE,YAAY;aAC1B;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,SAAS;gBACjB,WAAW,EAAE,YAAY;aAC1B;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,WAAW;aACzB;SACF;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,GAAG,IAAK,OAAgC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;QAC9C,IAAA,kBAAS,EAAC;YACR,IAAI;YACJ,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SACpC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,wBAAwB,IAAI,EAAE;SACrC,CAAC;KACH;SAAM;QACL,MAAM,IAAI,GAAI,OAA4B,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC;QACxD,IAAA,kBAAS,EAAC;YACR,IAAI;YACJ,IAAI,EAAE,cAAc,CAAC,MAAA,IAAI,CAAC,SAAS,oDAAI,CAAC;SACzC,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,wBAAwB,IAAI,EAAE;SACrC,CAAC;KACH;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,IAAA,6BAAa,EAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,GAAG,EAAE,CAAC,IAAA,6BAAqB,EAAC,OAAO,CAAC;CAChD,CAAC,CAAC,CAAC;AAEJ,kBAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@asapjs/sequelize",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@asapjs/core": "^0.0.9",
|
|
22
|
+
"@asapjs/router": "^0.2.3",
|
|
22
23
|
"@types/body-parser": "^1.19.2",
|
|
23
24
|
"@types/cors": "^2.8.12",
|
|
24
25
|
"@types/express": "^4.17.13",
|