@asapjs/sequelize 0.3.25 → 0.3.27

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.
@@ -4,6 +4,7 @@ interface IColumnInfo {
4
4
  type: string;
5
5
  note: string | null;
6
6
  enum?: string[];
7
+ data?: any;
7
8
  }
8
9
  interface ITableInfo {
9
10
  name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/console/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAQtC,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,IAAI,EAAE,GAAG,CAAC;CACX;AA6ED,eAAO,MAAQ,QAAQ,SA7DU,MAAM,aAAa,MAAM;;qBA6DjC,MAAM,SAtDA,MAAM,aAAa,MAAM;;qBAsDvB,cAAc;;;EAA6B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/console/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAQtC,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,IAAI,EAAE,GAAG,CAAC;CACX;AA4FD,eAAO,MAAQ,QAAQ,SA3EU,MAAM,aAAa,MAAM;;qBA2EjC,MAAM,SApEA,MAAM,aAAa,MAAM;;qBAoEvB,cAAc;;;EAA6B,CAAC"}
@@ -14,6 +14,7 @@ exports.getConsoleData = exports.addDto = exports.addTable = void 0;
14
14
  class ConsoleApplication {
15
15
  constructor() {
16
16
  this.tableNames = {};
17
+ this.dtoNames = {};
17
18
  this.tables = [];
18
19
  this.dtos = [];
19
20
  this.enums = [];
@@ -26,13 +27,15 @@ class ConsoleApplication {
26
27
  });
27
28
  this.addDto = (name, className, data) => __awaiter(this, void 0, void 0, function* () {
28
29
  console.log('added dto', name, className);
30
+ this.dtoNames = Object.assign(Object.assign({}, this.dtoNames), { [className]: name });
29
31
  const dtoInfo = { name, columns: [], data };
30
32
  this.dtos.push(dtoInfo);
31
33
  });
32
34
  this.mapData = (info) => __awaiter(this, void 0, void 0, function* () {
33
- Object.entries(info.data).forEach(([key, v]) => {
35
+ if (info.columns.length > 0)
36
+ return info;
37
+ Object.entries(info.data).forEach(([key, v]) => __awaiter(this, void 0, void 0, function* () {
34
38
  var _a, _b, _c, _d, _e, _f;
35
- console.log(v);
36
39
  if (v.__name === 'foreignkey') {
37
40
  info.columns.push({
38
41
  name: key,
@@ -45,6 +48,19 @@ class ConsoleApplication {
45
48
  toTableClassName: (_c = (_b = (_a = v.toSequelize) === null || _a === void 0 ? void 0 : _a.call(v)) === null || _b === void 0 ? void 0 : _b.table) === null || _c === void 0 ? void 0 : _c.name,
46
49
  });
47
50
  }
51
+ else if (v.__name === 'dto') {
52
+ console.log('dto 이름', v.toSequelize().dto, v.toSequelize().dto.name);
53
+ const dto = this.dtos.find((d) => { var _a, _b, _c; return d.name === ((_c = (_b = (_a = v.toSequelize) === null || _a === void 0 ? void 0 : _a.call(v)) === null || _b === void 0 ? void 0 : _b.dto) === null || _c === void 0 ? void 0 : _c.name); });
54
+ if (dto) {
55
+ const result = yield this.mapData(dto);
56
+ info.columns.push({
57
+ name: key,
58
+ type: 'dto',
59
+ note: result.name,
60
+ data: result,
61
+ });
62
+ }
63
+ }
48
64
  else if (v.__name !== 'belongsto') {
49
65
  const enumData = (_e = (_d = v.toSwagger) === null || _d === void 0 ? void 0 : _d.call(v)) === null || _e === void 0 ? void 0 : _e.enum;
50
66
  const enumName = `${info === null || info === void 0 ? void 0 : info.name}_${key}_enum`;
@@ -61,7 +77,7 @@ class ConsoleApplication {
61
77
  });
62
78
  }
63
79
  }
64
- });
80
+ }));
65
81
  return info;
66
82
  });
67
83
  this.generateConsoleData = () => __awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/console/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/console/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@asapjs/sequelize",
3
- "version": "0.3.25",
3
+ "version": "0.3.27",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {