@asapjs/sequelize 0.3.26 → 0.3.28

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,19 +4,20 @@ interface IColumnInfo {
4
4
  type: string;
5
5
  note: string | null;
6
6
  enum?: string[];
7
+ data?: any;
7
8
  }
8
- interface ITableInfo {
9
- name: string;
10
- columns: IColumnInfo[];
11
- data: any;
12
- }
13
- export declare const addTable: (name: string, className: string, data: {
14
- [k: string]: TypeIsData;
15
- }) => Promise<void>, addDto: (name: string, className: string, data: {
9
+ declare type TType = {
16
10
  [k: string]: TypeIsData;
17
- }) => Promise<void>, getConsoleData: () => Promise<{
18
- tables: ITableInfo[];
19
- dtos: ITableInfo[];
11
+ };
12
+ export declare const addTable: (name: string, className: string, types: TType) => Promise<void>, addDto: (name: string, className: string, types: TType) => Promise<void>, getConsoleData: () => Promise<{
13
+ tables: {
14
+ name: string;
15
+ data: IColumnInfo[];
16
+ }[];
17
+ dtos: {
18
+ name: string;
19
+ data: IColumnInfo[];
20
+ }[];
20
21
  }>;
21
22
  export {};
22
23
  //# 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;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;AAEtC,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,aAAK,KAAK,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAC;AA8DzC,eAAO,MAAQ,QAAQ,SAnDU,MAAM,aAAa,MAAM,SAAS,KAAK,oBAmD/C,MAAM,SA9CA,MAAM,aAAa,MAAM,SAAS,KAAK,oBA8CrC,cAAc;;;;;;;;;EAA6B,CAAC"}
@@ -13,57 +13,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.getConsoleData = exports.addDto = exports.addTable = void 0;
14
14
  class ConsoleApplication {
15
15
  constructor() {
16
- this.tableNames = {};
17
16
  this.tables = [];
18
17
  this.dtos = [];
19
- this.enums = [];
20
- this.relations = [];
21
- this.addTable = (name, className, data) => __awaiter(this, void 0, void 0, function* () {
22
- console.log('added table', name, className);
23
- this.tableNames = Object.assign(Object.assign({}, this.tableNames), { [className]: name });
24
- const tableInfo = { name, columns: [], data };
18
+ this.addTable = (name, className, types) => __awaiter(this, void 0, void 0, function* () {
19
+ const tableInfo = { name, types };
25
20
  this.tables.push(tableInfo);
26
21
  });
27
- this.addDto = (name, className, data) => __awaiter(this, void 0, void 0, function* () {
28
- console.log('added dto', name, className);
29
- const dtoInfo = { name, columns: [], data };
22
+ this.addDto = (name, className, types) => __awaiter(this, void 0, void 0, function* () {
23
+ const dtoInfo = { name, types };
30
24
  this.dtos.push(dtoInfo);
31
25
  });
32
26
  this.mapData = (info) => __awaiter(this, void 0, void 0, function* () {
33
- if (info.columns.length > 0)
34
- return info;
35
- Object.entries(info.data).forEach(([key, v]) => {
36
- var _a, _b, _c, _d, _e, _f;
37
- if (v.__name === 'foreignkey') {
38
- info.columns.push({
39
- name: key,
40
- type: 'int',
41
- note: '',
42
- });
43
- this.relations.push({
44
- fromTableName: info === null || info === void 0 ? void 0 : info.name,
45
- fromTableColumnName: key,
46
- 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,
47
- });
27
+ const columns = [];
28
+ Object.entries(info.types).forEach(([key, v]) => __awaiter(this, void 0, void 0, function* () {
29
+ var _a, _b, _c;
30
+ if (v.__name === 'dto') {
31
+ 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); });
32
+ if (dto) {
33
+ const { data } = yield this.mapData(dto);
34
+ columns.push({
35
+ name: key,
36
+ type: 'dto',
37
+ note: dto.name,
38
+ data,
39
+ });
40
+ }
48
41
  }
49
42
  else if (v.__name !== 'belongsto') {
50
- const enumData = (_e = (_d = v.toSwagger) === null || _d === void 0 ? void 0 : _d.call(v)) === null || _e === void 0 ? void 0 : _e.enum;
43
+ const enumData = (_b = (_a = v.toSwagger) === null || _a === void 0 ? void 0 : _a.call(v)) === null || _b === void 0 ? void 0 : _b.enum;
51
44
  const enumName = `${info === null || info === void 0 ? void 0 : info.name}_${key}_enum`;
52
- info.columns.push({
45
+ columns.push({
53
46
  name: key,
54
47
  type: enumData ? enumName : v.__name,
55
- note: (_f = v.toSwagger) === null || _f === void 0 ? void 0 : _f.call(v).description,
48
+ note: (_c = v.toSwagger) === null || _c === void 0 ? void 0 : _c.call(v).description,
56
49
  enum: enumData,
57
50
  });
58
- if (enumData) {
59
- this.enums.push({
60
- name: enumName,
61
- values: enumData,
62
- });
63
- }
64
51
  }
65
- });
66
- return info;
52
+ }));
53
+ return { name: info.name, data: columns };
67
54
  });
68
55
  this.generateConsoleData = () => __awaiter(this, void 0, void 0, function* () {
69
56
  const tables = yield Promise.all(this.tables.map(this.mapData));
@@ -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.26",
3
+ "version": "0.3.28",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {