@asapjs/sequelize 0.2.4 → 0.2.5

package/dist/dbml/index.d.ts

@@ -1,4 +1,4 @@
-import { TypeIsData } from '../type';
+import { TypeIsData } from '../types';
 export declare const addTable: (name: string, className: string, data: {
     [k: string]: TypeIsData;
 }) => Promise<void>, getDBMLData: () => Promise<any>;

package/dist/dbml/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dbml/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAuJrC,eAAO,MAAQ,QAAQ,SA/GU,MAAM,aAAa,MAAM;;qBA+GjC,WAAW,oBAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dbml/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAuJtC,eAAO,MAAQ,QAAQ,SA/GU,MAAM,aAAa,MAAM;;qBA+GjC,WAAW,oBAA0B,CAAC"}

package/dist/dto/ExtendableDto.d.ts

@@ -0,0 +1,22 @@
+import 'reflect-metadata';
+import { Model } from 'sequelize-typescript';
+import { Attributes, Includeable } from 'sequelize';
+interface DtoMiddlewareReturn {
+    as?: string;
+    model: typeof Model;
+    attributes: Attributes<Model>;
+    include?: Includeable[];
+}
+export default class ExtendableDto {
+    map: (data: any) => any;
+    pagingMap: (data: any) => any;
+    middleware: (as?: string | undefined, user?: any, extraAs?: string[] | undefined) => DtoMiddlewareReturn;
+    swagger: () => {
+        type: string;
+        properties: {
+            [key: string]: unknown;
+        };
+    };
+}
+export {};
+//# sourceMappingURL=ExtendableDto.d.ts.map

package/dist/dto/ExtendableDto.d.ts.map

@@ -0,0 +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;AAM7D,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;IACzB,GAAG,SAAU,GAAG,KAAG,GAAG,CAsC3B;IAEK,SAAS,SAAU,GAAG,KAAG,GAAG,CAIjC;IAEK,UAAU,mCAAwB,GAAG,yDAmF1C;IAEK,OAAO;;;;;MAsBZ;CACH"}

package/dist/dto/ExtendableDto.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const sequelize_1 = require("sequelize");
+const types_1 = require("../types");
+const core_1 = require("@asapjs/core");
+class ExtendableDto {
+    constructor() {
+        this.map = (data) => {
+            const types = (0, types_1.getTypesData)(this);
+            const properties = Object.assign({}, types);
+            const o = (data === null || data === void 0 ? void 0 : data.dataValues) || data;
+            const isArray = Array.isArray(o);
+            if (isArray) {
+                return o.map((item) => this.map(item));
+            }
+            return Object.keys(properties).reduce((p, key) => {
+                var _a, _b;
+                const property = properties[key];
+                if (property.__name === 'dto') {
+                    // DTO TYPE인데 toSequelize가 없을 경우
+                    if (!property.toSequelize) {
+                        core_1.logger.error(`@asapjs/sequelize :: @TypeIs.DTO - ${key}에서 에러가 발생했습니다.`);
+                        process.exit(1);
+                    }
+                    const data = property.toSequelize();
+                    if (!data.dto) {
+                        core_1.logger.error(`@asapjs/sequelize :: @TypeIs.DTO - ${key}에 dto가 전달되지 않았습니다..`);
+                        process.exit(1);
+                    }
+                    p[key] = new data.dto().map(o === null || o === void 0 ? void 0 : o[key]);
+                }
+                else if (property.__name === 'query') {
+                    p[key] = (_a = property === null || property === void 0 ? void 0 : property.fixValue) === null || _a === void 0 ? void 0 : _a.call(property, o === null || o === void 0 ? void 0 : o[key]);
+                }
+                else {
+                    p[key] = ((_b = property === null || property === void 0 ? void 0 : property.fixValue) === null || _b === void 0 ? void 0 : _b.call(property, o === null || o === void 0 ? void 0 : o[key])) || (o === null || o === void 0 ? void 0 : o[key]);
+                }
+                return p;
+            }, {});
+        };
+        this.pagingMap = (data) => {
+            const o = data.data;
+            return Object.assign(Object.assign({}, data), { data: o.map((item) => this.map(item)) });
+        };
+        this.middleware = (as, user, extraAs) => {
+            const modelInfo = Reflect.getMetadata('sequelize::dtoInfo', this);
+            const types = (0, types_1.getTypesData)(this);
+            const extraAsData = extraAs ? [...extraAs, as].filter((v) => !!v) : as ? [as] : [];
+            const attributes = [];
+            const include = [];
+            if (types) {
+                // DTO와 QUERY TYPE은 따로 Include 필요하기 때문에 필터링
+                const attributesOptions = Object.entries(types).filter(([key, v]) => !['dto', 'query'].includes(v.__name));
+                if (attributesOptions) {
+                    attributesOptions.forEach(([key, v]) => {
+                        attributes.push(key);
+                    });
+                }
+                // QUERY TYPE 필터링
+                const queryOptions = Object.entries(types).filter(([key, v]) => v.__name === 'query');
+                if (queryOptions) {
+                    queryOptions.forEach(([key, v]) => {
+                        // QUERY TYPE인데 toSequelize가 없을 경우
+                        if (!v.toSequelize) {
+                            core_1.logger.error(`@asapjs/sequelize :: @TypeIs.QUERY - ${key}에서 에러가 발생했습니다.`);
+                            process.exit(1);
+                        }
+                        if (!v.toSequelize().query) {
+                            core_1.logger.error(`@asapjs/sequelize :: @TypeIs.QUERY - ${key}에 query가 전달되지 않았습니다..`);
+                            process.exit(1);
+                        }
+                        const association = extraAsData.length >= 2 ? '`' + `${extraAsData.join('->')}` + '`' : as || modelInfo.defineTable.name;
+                        attributes.push([
+                            (0, sequelize_1.literal)(v.toSequelize().query({
+                                association: association,
+                                user,
+                            })),
+                            key,
+                        ]);
+                    });
+                }
+                // DTO TYPE 필터링
+                const connectOptions = Object.entries(types).filter(([key, v]) => v.__name === 'dto');
+                if (connectOptions) {
+                    connectOptions.forEach(([key, v]) => {
+                        // DTO TYPE인데 toSequelize가 없을 경우
+                        if (!v.toSequelize) {
+                            core_1.logger.error(`@asapjs/sequelize :: @TypeIs.DTO - ${key}에서 에러가 발생했습니다.`);
+                            process.exit(1);
+                        }
+                        const data = v.toSequelize();
+                        if (!data.dto) {
+                            core_1.logger.error(`@asapjs/sequelize :: @TypeIs.DTO - ${key}에 dto가 전달되지 않았습니다..`);
+                            process.exit(1);
+                        }
+                        include.push(new data.dto().middleware((data === null || data === void 0 ? void 0 : data.as) || key, user, extraAsData));
+                    });
+                }
+            }
+            const result = {
+                model: modelInfo.defineTable,
+                attributes,
+            };
+            if (as)
+                result.as = as;
+            if (include.length > 0)
+                result.include = include;
+            return result;
+        };
+        this.swagger = () => {
+            const types = (0, types_1.getTypesData)(this);
+            const data = Object.keys(types).reduce((p, key) => {
+                var _a, _b;
+                const property = types[key];
+                if (property.toSwagger) {
+                    p[key] = property.toSwagger() || null;
+                }
+                else {
+                    core_1.logger.warn(`@asapjs/sequelize :: TypeIs.${(_b = (_a = property === null || property === void 0 ? void 0 : property.__name) === null || _a === void 0 ? void 0 : _a.toUpperCase) === null || _b === void 0 ? void 0 : _b.call(_a)}에 toSwagger가 정의되지 않았습니다.`);
+                    p[key] = null;
+                }
+                return p;
+            }, {});
+            return {
+                type: 'object',
+                properties: data,
+            };
+        };
+    }
+}
+exports.default = ExtendableDto;
+//# sourceMappingURL=ExtendableDto.js.map

package/dist/dto/ExtendableDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExtendableDto.js","sourceRoot":"","sources":["../../src/dto/ExtendableDto.ts"],"names":[],"mappings":"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"}

package/dist/dto/PaginationQueryDto.d.ts

@@ -0,0 +1,6 @@
+import { ExtendableDto } from './index';
+export default class PaginationQueryDto extends ExtendableDto {
+    page: number;
+    limit: number;
+}
+//# sourceMappingURL=PaginationQueryDto.d.ts.map

package/dist/dto/PaginationQueryDto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaginationQueryDto.d.ts","sourceRoot":"","sources":["../../src/dto/PaginationQueryDto.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,aAAa;IAE3D,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC;CACf"}

package/dist/dto/PaginationQueryDto.js

@@ -0,0 +1,25 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../types");
+const index_1 = require("./index");
+class PaginationQueryDto extends index_1.ExtendableDto {
+}
+__decorate([
+    types_1.TypeIs.INT({ comment: '페이지' }),
+    __metadata("design:type", Number)
+], PaginationQueryDto.prototype, "page", void 0);
+__decorate([
+    types_1.TypeIs.INT({ comment: '한 페이지당 표시 개수' }),
+    __metadata("design:type", Number)
+], PaginationQueryDto.prototype, "limit", void 0);
+exports.default = PaginationQueryDto;
+//# sourceMappingURL=PaginationQueryDto.js.map

package/dist/dto/PaginationQueryDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaginationQueryDto.js","sourceRoot":"","sources":["../../src/dto/PaginationQueryDto.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oCAAkC;AAClC,mCAAwC;AAExC,MAAqB,kBAAmB,SAAQ,qBAAa;CAM5D;AAJC;IADC,cAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;gDAClB;AAGb;IADC,cAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;;iDAC1B;AALhB,qCAMC"}

package/dist/dto/index.d.ts

@@ -1,44 +1,10 @@
 import 'reflect-metadata';
 import { Model, TableOptions } from 'sequelize-typescript';
-import { AbstractDataTypeConstructor, Includeable } from 'sequelize';
-interface DtoMiddlewareReturn {
-    as?: string;
-    model: typeof Model;
-    attributes: string[];
-    include?: Includeable[];
-}
-export declare class ExtendableDto {
-    id?: number;
-    version?: number | any;
-    map: (data: any) => any;
-    pagingMap: (data: any) => any;
-    middleware: (as?: string | undefined, user?: any, extraAs?: string[] | undefined) => DtoMiddlewareReturn;
-    swagger: () => {
-        type: string;
-        properties: {
-            [key: string]: any;
-        };
-    };
-}
-export declare class PaginationQueryDto extends ExtendableDto {
-    page: number;
-    limit: number;
-}
 export declare function Dto(info: {
     timestamps?: boolean;
     name?: string;
     defineTable: typeof Model;
 }): (target: any, options?: TableOptions) => void;
-export declare function DtoType(ConnectTo: any, as: string): (target: any, propertyName: string, propertyDescriptor?: PropertyDescriptor | undefined) => void;
-interface QueryParams {
-    user?: any;
-    association?: string;
-}
-interface DtoQueryParams {
-    query: (props: QueryParams) => string;
-    type?: AbstractDataTypeConstructor;
-    example?: any;
-}
-export declare function DtoQuery({ query, type, example }: DtoQueryParams): (target: any, propertyName: string, propertyDescriptor?: PropertyDescriptor | undefined) => void;
-export {};
+export { default as ExtendableDto } from './ExtendableDto';
+export { default as PaginationQueryDto } from './PaginationQueryDto';
 //# sourceMappingURL=index.d.ts.map

package/dist/dto/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dto/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,2BAA2B,EAAE,WAAW,EAAW,MAAM,WAAW,CAAC;AAI9E,UAAU,mBAAmB;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,qBAAa,aAAa;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAEvB,GAAG,SAAU,GAAG,KAAG,GAAG,CA4B3B;IAEK,SAAS,SAAU,GAAG,KAAG,GAAG,CAIjC;IAEK,UAAU,mCAAwB,GAAG,yDAgE1C;IAEK,OAAO;;;;;MAeZ;CACH;AAED,qBAAa,kBAAmB,SAAQ,aAAa;IAEnD,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,KAAK,CAAA;CAAE,YACzD,GAAG,YAAW,YAAY,KAAQ,IAAI,CAOxE;AAuBD,wBAAgB,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,YAChC,GAAG,gBAAgB,MAAM,+DAkB1C;AAED,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,CAAC;IACtC,IAAI,CAAC,EAAE,2BAA2B,CAAC;IACnC,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,cAAc,YAC/C,GAAG,gBAAgB,MAAM,+DAe1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dto/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE3D,wBAAgB,GAAG,CAAC,IAAI,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,KAAK,CAAA;CAAE,YACjE,GAAG,YAAW,YAAY,KAAQ,IAAI,CAOhE;AAED,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/dto/index.js

@@ -1,180 +1,19 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DtoQuery = exports.DtoType = exports.Dto = exports.PaginationQueryDto = exports.ExtendableDto = void 0;
+exports.PaginationQueryDto = exports.ExtendableDto = exports.Dto = void 0;
 require("reflect-metadata");
-const sequelize_1 = require("sequelize");
-const type_1 = require("../type");
-class ExtendableDto {
-    constructor() {
-        this.map = (data) => {
-            const types = (0, type_1.getTypesData)(this);
-            const properties = Object.assign({}, types);
-            const o = (data === null || data === void 0 ? void 0 : data.dataValues) || data;
-            const isArray = Array.isArray(o);
-            if (isArray) {
-                return o.map((item) => this.map(item));
-            }
-            return Object.keys(properties).reduce((p, key) => {
-                var _a, _b, _c, _d, _e, _f;
-                const property = properties[key];
-                if (property.__name === 'dto') {
-                    p[key] = (_d = (_c = new ((_b = (_a = property === null || property === void 0 ? void 0 : property.toSequelize) === null || _a === void 0 ? void 0 : _a.call(property)) === null || _b === void 0 ? void 0 : _b.dto)()) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, o === null || o === void 0 ? void 0 : o[key]);
-                }
-                else {
-                    if (property.__name === 'query') {
-                        p[key] = (_e = property === null || property === void 0 ? void 0 : property.fixValue) === null || _e === void 0 ? void 0 : _e.call(property, o === null || o === void 0 ? void 0 : o[key]);
-                    }
-                    else {
-                        p[key] = ((_f = property === null || property === void 0 ? void 0 : property.fixValue) === null || _f === void 0 ? void 0 : _f.call(property, o === null || o === void 0 ? void 0 : o[key])) || (o === null || o === void 0 ? void 0 : o[key]);
-                    }
-                }
-                return p;
-            }, {});
-        };
-        this.pagingMap = (data) => {
-            const o = data.data;
-            return Object.assign(Object.assign({}, data), { data: o.map((item) => this.map(item)) });
-        };
-        this.middleware = (as, user, extraAs) => {
-            const modelInfo = Reflect.getMetadata('sequelize::dtoInfo', this);
-            const types = (0, type_1.getTypesData)(this);
-            // const attributesOptions = Reflect.getMetadata('sequelize:attributes', this);
-            // const connectOptions = Reflect.getMetadata('sequelize::dtoTypes', this);
-            // const queryOptions = Reflect.getMetadata('sequelize::queryTypes', this);
-            const extraAsData = extraAs ? [...extraAs, as].filter((v) => !!v) : as ? [as] : [];
-            const attributes = [];
-            const include = [];
-            if (types) {
-                const attributesOptions = Object.entries(types).filter(([key, v]) => !['dto', 'query'].includes(v.__name));
-                if (attributesOptions) {
-                    attributesOptions.forEach(([key, v]) => {
-                        attributes.push(key);
-                    });
-                }
-                const queryOptions = Object.entries(types).filter(([key, v]) => v.__name === 'query');
-                if (queryOptions) {
-                    queryOptions.forEach(([key, v]) => {
-                        var _a, _b, _c;
-                        attributes.push([
-                            (0, sequelize_1.literal)((_c = (_b = (_a = v === null || v === void 0 ? void 0 : v.toSequelize) === null || _a === void 0 ? void 0 : _a.call(v)) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.call(_b, {
-                                association: extraAsData.length >= 2 ? '`' + `${extraAsData.join('->')}` + '`' : as || modelInfo.defineTable.name,
-                                user,
-                            })),
-                            key,
-                        ]);
-                    });
-                }
-                const connectOptions = Object.entries(types).filter(([key, v]) => v.__name === 'dto');
-                if (connectOptions) {
-                    connectOptions.forEach(([key, v]) => {
-                        var _a;
-                        const data = (_a = v === null || v === void 0 ? void 0 : v.toSequelize) === null || _a === void 0 ? void 0 : _a.call(v);
-                        include.push(new (data === null || data === void 0 ? void 0 : data.dto)().middleware(data === null || data === void 0 ? void 0 : data.as, user, extraAsData));
-                    });
-                }
-            }
-            // if (modelInfo.timestamps) {
-            //   attributes.push('created_at');
-            //   attributes.push('updated_at');
-            // }
-            const result = {
-                model: modelInfo.defineTable,
-                attributes,
-            };
-            if (as)
-                result.as = as;
-            if (include.length > 0)
-                result.include = include;
-            return result;
-        };
-        this.swagger = () => {
-            const types = (0, type_1.getTypesData)(this);
-            const data = Object.keys(types).reduce((p, key) => {
-                var _a;
-                const property = types[key];
-                p[key] = ((_a = property === null || property === void 0 ? void 0 : property.toSwagger) === null || _a === void 0 ? void 0 : _a.call(property)) || null;
-                return p;
-            }, {});
-            return {
-                type: 'object',
-                properties: data,
-            };
-        };
-    }
-}
-exports.ExtendableDto = ExtendableDto;
-class PaginationQueryDto extends ExtendableDto {
-}
-__decorate([
-    type_1.TypeIs.INT({ comment: '페이지' }),
-    __metadata("design:type", Number)
-], PaginationQueryDto.prototype, "page", void 0);
-__decorate([
-    type_1.TypeIs.INT({ comment: '한 페이지당 표시 개수' }),
-    __metadata("design:type", Number)
-], PaginationQueryDto.prototype, "limit", void 0);
-exports.PaginationQueryDto = PaginationQueryDto;
 function Dto(info) {
-    return function annotate(target, options = {}) {
+    return function (target, options = {}) {
         const args = Object.assign(Object.assign({}, info), { timestamps: info.timestamps === undefined });
         Reflect.defineMetadata('sequelize::dtoInfo', args, target.prototype);
     };
 }
 exports.Dto = Dto;
-const getAttributes = (target, key) => {
-    let attributes = Reflect.getMetadata(key, target);
-    if (attributes) {
-        return Object.keys(attributes).reduce((copy, key) => {
-            copy[key] = Object.assign({}, attributes[key]);
-            return copy;
-        }, {});
-    }
-    if (!attributes) {
-        attributes = {};
-    }
-    return attributes;
-};
-const getDtoTypes = (target) => getAttributes(target, 'sequelize::dtoTypes');
-const getDtoQueries = (target) => getAttributes(target, 'sequelize::queryTypes');
-function DtoType(ConnectTo, as) {
-    return (target, propertyName, propertyDescriptor) => {
-        const attributes = getDtoTypes(target);
-        const ConnectDto = ConnectTo();
-        const swaggerExampleData = new ConnectDto().swagger(as);
-        const options = {
-            type: 'dto',
-            as,
-            ConnectDto,
-            example: swaggerExampleData,
-        };
-        attributes[propertyName] = Object.assign({}, options);
-        Reflect.defineMetadata('sequelize::dtoTypes', Object.assign({}, attributes), target);
-    };
-}
-exports.DtoType = DtoType;
-function DtoQuery({ query, type, example }) {
-    return (target, propertyName, propertyDescriptor) => {
-        const queries = getDtoQueries(target);
-        queries[propertyName] = {
-            type: 'query',
-            data: {
-                as: propertyName,
-                query: (props) => query(props),
-                type,
-            },
-            example,
-        };
-        Reflect.defineMetadata('sequelize::queryTypes', Object.assign({}, queries), target);
-    };
-}
-exports.DtoQuery = DtoQuery;
+var ExtendableDto_1 = require("./ExtendableDto");
+Object.defineProperty(exports, "ExtendableDto", { enumerable: true, get: function () { return __importDefault(ExtendableDto_1).default; } });
+var PaginationQueryDto_1 = require("./PaginationQueryDto");
+Object.defineProperty(exports, "PaginationQueryDto", { enumerable: true, get: function () { return __importDefault(PaginationQueryDto_1).default; } });
 //# sourceMappingURL=index.js.map

package/dist/dto/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dto/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dto/index.ts"],"names":[],"mappings":";;;;;;AAAA,4BAA0B;AAI1B,SAAgB,GAAG,CAAC,IAAwE;IAC1F,OAAO,UAAU,MAAW,EAAE,UAAwB,EAAE;QACtD,MAAM,IAAI,mCACL,IAAI,KACP,UAAU,EAAE,IAAI,CAAC,UAAU,KAAK,SAAS,GAC1C,CAAC;QACF,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC,CAAC;AACJ,CAAC;AARD,kBAQC;AAED,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB"}

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-export { ExtendableDto, PaginationQueryDto, Dto, DtoType, DtoQuery } from './dto';
+export { ExtendableDto, PaginationQueryDto, Dto } from './dto';
 export { initSequelizeModule, getSequelize, modelsSync, generateDBML } from './sequelize';
 export { default as Repository } from './repository';
 export { Table } from './table';
-export { TypeIs, TypeArray, TypePaging, DtoOrTypeIs } from './type';
+export { TypeIs, DtoOrTypeIs } from './types';
 export { getUserIdInQuery } from './utils/getUserIdInQuery';
 export { getDBMLData } from './dbml';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC"}

package/dist/index.js

@@ -3,13 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDBMLData = exports.getUserIdInQuery = exports.TypePaging = exports.TypeArray = exports.TypeIs = exports.Table = exports.Repository = exports.generateDBML = exports.modelsSync = exports.getSequelize = exports.initSequelizeModule = exports.DtoQuery = exports.DtoType = exports.Dto = exports.PaginationQueryDto = exports.ExtendableDto = void 0;
+exports.getDBMLData = exports.getUserIdInQuery = exports.TypeIs = exports.Table = exports.Repository = exports.generateDBML = exports.modelsSync = exports.getSequelize = exports.initSequelizeModule = exports.Dto = exports.PaginationQueryDto = exports.ExtendableDto = void 0;
 var dto_1 = require("./dto");
 Object.defineProperty(exports, "ExtendableDto", { enumerable: true, get: function () { return dto_1.ExtendableDto; } });
 Object.defineProperty(exports, "PaginationQueryDto", { enumerable: true, get: function () { return dto_1.PaginationQueryDto; } });
 Object.defineProperty(exports, "Dto", { enumerable: true, get: function () { return dto_1.Dto; } });
-Object.defineProperty(exports, "DtoType", { enumerable: true, get: function () { return dto_1.DtoType; } });
-Object.defineProperty(exports, "DtoQuery", { enumerable: true, get: function () { return dto_1.DtoQuery; } });
 var sequelize_1 = require("./sequelize");
 Object.defineProperty(exports, "initSequelizeModule", { enumerable: true, get: function () { return sequelize_1.initSequelizeModule; } });
 Object.defineProperty(exports, "getSequelize", { enumerable: true, get: function () { return sequelize_1.getSequelize; } });
@@ -19,10 +17,8 @@ var repository_1 = require("./repository");
 Object.defineProperty(exports, "Repository", { enumerable: true, get: function () { return __importDefault(repository_1).default; } });
 var table_1 = require("./table");
 Object.defineProperty(exports, "Table", { enumerable: true, get: function () { return table_1.Table; } });
-var type_1 = require("./type");
-Object.defineProperty(exports, "TypeIs", { enumerable: true, get: function () { return type_1.TypeIs; } });
-Object.defineProperty(exports, "TypeArray", { enumerable: true, get: function () { return type_1.TypeArray; } });
-Object.defineProperty(exports, "TypePaging", { enumerable: true, get: function () { return type_1.TypePaging; } });
+var types_1 = require("./types");
+Object.defineProperty(exports, "TypeIs", { enumerable: true, get: function () { return types_1.TypeIs; } });
 var getUserIdInQuery_1 = require("./utils/getUserIdInQuery");
 Object.defineProperty(exports, "getUserIdInQuery", { enumerable: true, get: function () { return getUserIdInQuery_1.getUserIdInQuery; } });
 var dbml_1 = require("./dbml");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAkF;AAAzE,oGAAA,aAAa,OAAA;AAAE,yGAAA,kBAAkB,OAAA;AAAE,0FAAA,GAAG,OAAA;AAAE,8FAAA,OAAO,OAAA;AAAE,+FAAA,QAAQ,OAAA;AAClE,yCAA0F;AAAjF,gHAAA,mBAAmB,OAAA;AAAE,yGAAA,YAAY,OAAA;AAAE,uGAAA,UAAU,OAAA;AAAE,yGAAA,YAAY,OAAA;AACpE,2CAAqD;AAA5C,yHAAA,OAAO,OAAc;AAC9B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,+BAAoE;AAA3D,8FAAA,MAAM,OAAA;AAAE,iGAAA,SAAS,OAAA;AAAE,kGAAA,UAAU,OAAA;AACtC,6DAA4D;AAAnD,oHAAA,gBAAgB,OAAA;AACzB,+BAAqC;AAA5B,mGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,6BAA+D;AAAtD,oGAAA,aAAa,OAAA;AAAE,yGAAA,kBAAkB,OAAA;AAAE,0FAAA,GAAG,OAAA;AAC/C,yCAA0F;AAAjF,gHAAA,mBAAmB,OAAA;AAAE,yGAAA,YAAY,OAAA;AAAE,uGAAA,UAAU,OAAA;AAAE,yGAAA,YAAY,OAAA;AACpE,2CAAqD;AAA5C,yHAAA,OAAO,OAAc;AAC9B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,iCAA8C;AAArC,+FAAA,MAAM,OAAA;AACf,6DAA4D;AAAnD,oHAAA,gBAAgB,OAAA;AACzB,+BAAqC;AAA5B,mGAAA,WAAW,OAAA"}

package/dist/table/index.d.ts

@@ -1,3 +1,4 @@
 import { ModelOptions } from 'sequelize';
-export declare function Table(options: ModelOptions): <T extends new (...args: any[]) => {}>(target: T) => void;
+import { ClassType } from '../types';
+export declare function Table(options: ModelOptions): <T extends ClassType>(target: T) => void;
 //# sourceMappingURL=index.d.ts.map

package/dist/table/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/table/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,YAAY,EAAE,MAAM,WAAW,CAAC;AAc5F,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,4BACE,GAAG,EAAE,KAAG,EAAE,qBA4CtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/table/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,EAAgB,SAAS,EAAE,MAAM,UAAU,CAAC;AAEnD,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,4CAsC1C"}

package/dist/table/index.js

@@ -2,42 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Table = void 0;
 const sequelize_typescript_1 = require("sequelize-typescript");
-const foreign_key_service_1 = require("sequelize-typescript/dist/associations/foreign-key/foreign-key-service");
+const belongsto_1 = require("../types/belongsto");
+const foreignkey_1 = require("../types/foreignkey");
 const dbml_1 = require("../dbml");
-const type_1 = require("../type");
+const types_1 = require("../types");
 function Table(options) {
     return function (target) {
         const modelName = options.tableName || target.name;
-        const types = (0, type_1.getTypesData)(target);
+        const types = (0, types_1.getTypesData)(target);
         Object.entries(types).forEach(([key, type]) => {
-            if (!['foreignkey', 'belongsto'].includes(type.__name)) {
-                (0, sequelize_typescript_1.addAttribute)(target.prototype, key, type.toSequelize());
-            }
-            else if (type.__name === 'foreignkey') {
-                const { extraData, table } = type.toSequelize();
-                (0, foreign_key_service_1.addForeignKey)(target.prototype, table, key);
-                if (extraData) {
-                    const sequelizeType = ((extraData === null || extraData === void 0 ? void 0 : extraData.type) || type_1.TypeIs.INT())().toSequelize();
-                    (0, sequelize_typescript_1.addAttribute)(target.prototype, key, Object.assign(Object.assign({}, extraData), sequelizeType));
-                }
+            if (type.__name === 'foreignkey') {
+                (0, foreignkey_1.TypeIsForienKeyAddColumn)(target, type, key);
             }
             else if (type.__name === 'belongsto') {
-                const { associatedClassGetter, optionsOrForeignKey } = type.toSequelize();
-                const options = (0, sequelize_typescript_1.getPreparedAssociationOptions)(optionsOrForeignKey);
-                if (!options.as)
-                    options.as = key;
-                (0, sequelize_typescript_1.addAssociation)(target.prototype, new sequelize_typescript_1.BelongsToAssociation(associatedClassGetter, options));
+                (0, belongsto_1.TypeIsBelongsToAddColumn)(target, type, key);
+            }
+            else {
+                (0, sequelize_typescript_1.addAttribute)(target.prototype, key, type.toSequelize());
             }
         });
+        if ((options === null || options === void 0 ? void 0 : options.timestamps) !== false) {
+            (0, sequelize_typescript_1.addOptions)(target.prototype, {
+                createdAt: 'created_at',
+                timestamps: true,
+            });
+            (0, sequelize_typescript_1.addOptions)(target.prototype, {
+                updatedAt: 'updated_at',
+                timestamps: true,
+            });
+        }
+        // DBML GENERATE를 위한 Table 정보 저장
         (0, dbml_1.addTable)(modelName, target.name, types);
-        (0, sequelize_typescript_1.addOptions)(target.prototype, {
-            createdAt: 'created_at',
-            timestamps: true,
-        });
-        (0, sequelize_typescript_1.addOptions)(target.prototype, {
-            updatedAt: 'updated_at',
-            timestamps: true,
-        });
+        // sequelize-typescript
         (0, sequelize_typescript_1.setModelName)(target.prototype, modelName);
         (0, sequelize_typescript_1.addOptions)(target.prototype, Object.assign(Object.assign({}, options), { charset: 'utf8mb4', collate: 'utf8mb4_general_ci' }));
     };