@asapjs/sequelize 0.3.22 → 0.3.24

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.
@@ -17,7 +17,6 @@ export declare const addTable: (name: string, className: string, data: {
17
17
  }) => Promise<void>, getConsoleData: () => Promise<{
18
18
  tables: ITableInfo[];
19
19
  dtos: ITableInfo[];
20
- success: boolean;
21
20
  }>;
22
21
  export {};
23
22
  //# sourceMappingURL=index.d.ts.map
@@ -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;AAmCD,eAAO,MAAQ,QAAQ,SAtBU,MAAM,aAAa,MAAM;;qBAsBjC,MAAM,SAfA,MAAM,aAAa,MAAM;;qBAevB,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;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"}
@@ -16,6 +16,8 @@ class ConsoleApplication {
16
16
  this.tableNames = {};
17
17
  this.tables = [];
18
18
  this.dtos = [];
19
+ this.enums = [];
20
+ this.relations = [];
19
21
  this.addTable = (name, className, data) => __awaiter(this, void 0, void 0, function* () {
20
22
  console.log('added table', name, className);
21
23
  this.tableNames = Object.assign(Object.assign({}, this.tableNames), { [className]: name });
@@ -27,11 +29,48 @@ class ConsoleApplication {
27
29
  const dtoInfo = { name, columns: [], data };
28
30
  this.dtos.push(dtoInfo);
29
31
  });
32
+ this.mapData = (info) => __awaiter(this, void 0, void 0, function* () {
33
+ Object.entries(info.data).forEach(([key, v]) => {
34
+ var _a, _b, _c, _d;
35
+ console.log(v);
36
+ if (v.__name === 'foreignkey') {
37
+ info.columns.push({
38
+ name: key,
39
+ type: 'int',
40
+ note: '',
41
+ });
42
+ this.relations.push({
43
+ fromTableName: info === null || info === void 0 ? void 0 : info.name,
44
+ fromTableColumnName: key,
45
+ toTableClassName: (_a = v.toSequelize) === null || _a === void 0 ? void 0 : _a.call(v)().name,
46
+ });
47
+ }
48
+ else if (v.__name !== 'belongsto') {
49
+ const enumData = (_c = (_b = v.toSwagger) === null || _b === void 0 ? void 0 : _b.call(v)) === null || _c === void 0 ? void 0 : _c.enum;
50
+ const enumName = `${info === null || info === void 0 ? void 0 : info.name}_${key}_enum`;
51
+ info.columns.push({
52
+ name: key,
53
+ type: enumData ? enumName : v.__name,
54
+ note: (_d = v.toSwagger) === null || _d === void 0 ? void 0 : _d.call(v).description,
55
+ enum: enumData,
56
+ });
57
+ if (enumData) {
58
+ this.enums.push({
59
+ name: enumName,
60
+ values: enumData,
61
+ });
62
+ }
63
+ }
64
+ });
65
+ return info;
66
+ });
67
+ this.generateConsoleData = () => __awaiter(this, void 0, void 0, function* () {
68
+ const tables = yield Promise.all(this.tables.map(this.mapData));
69
+ const dtos = yield Promise.all(this.dtos.map(this.mapData));
70
+ return { tables, dtos };
71
+ });
30
72
  this.getConsoleData = () => __awaiter(this, void 0, void 0, function* () {
31
- console.log(this.tables);
32
- console.log(this.dtos);
33
- const data = { tables: this.tables, dtos: this.dtos, success: true };
34
- console.log('data', data);
73
+ const data = yield this.generateConsoleData();
35
74
  return data;
36
75
  });
37
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/console/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AA2BA,MAAM,kBAAkB;IAAxB;QACU,eAAU,GAA8B,EAAE,CAAC;QAE3C,WAAM,GAAiB,EAAE,CAAC;QAC1B,SAAI,GAAiB,EAAE,CAAC;QAEzB,aAAQ,GAAG,CAAO,IAAY,EAAE,SAAiB,EAAE,IAAiC,EAAE,EAAE;YAC7F,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,UAAU,mCAAQ,IAAI,CAAC,UAAU,KAAE,CAAC,SAAS,CAAC,EAAE,IAAI,GAAE,CAAC;YAC5D,MAAM,SAAS,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,IAAY,EAAE,SAAiB,EAAE,IAAiC,EAAE,EAAE;YAC3F,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAA,CAAC;QAEK,mBAAc,GAAG,GAAS,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACrE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAEY,KAAuC,IAAI,kBAAkB,EAAE,EAA7D,gBAAQ,gBAAE,cAAM,cAAE,sBAAc,qBAA8B"}
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.22",
3
+ "version": "0.3.24",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {