@eggjs/dal-runtime 4.0.0-beta.34 → 4.0.0-beta.36
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/BaseSqlMap.d.ts +17 -14
- package/dist/BaseSqlMap.js +168 -222
- package/dist/CodeGenerator.d.ts +16 -13
- package/dist/CodeGenerator.js +118 -149
- package/dist/DaoLoader.d.ts +7 -3
- package/dist/DaoLoader.js +16 -14
- package/dist/DataSource.d.ts +30 -26
- package/dist/DataSource.js +71 -74
- package/dist/DatabaseForker.d.ts +15 -11
- package/dist/DatabaseForker.js +48 -51
- package/dist/MySqlDataSource.d.ts +25 -21
- package/dist/MySqlDataSource.js +53 -54
- package/dist/NunjucksConverter.d.ts +75 -72
- package/dist/NunjucksConverter.js +90 -94
- package/dist/NunjucksUtil.d.ts +8 -4
- package/dist/NunjucksUtil.js +55 -65
- package/dist/SqlGenerator.d.ts +12 -8
- package/dist/SqlGenerator.js +224 -386
- package/dist/SqlMapLoader.d.ts +13 -9
- package/dist/SqlMapLoader.js +23 -21
- package/dist/SqlUtil.d.ts +5 -2
- package/dist/SqlUtil.js +185 -214
- package/dist/TableModelInstanceBuilder.d.ts +9 -5
- package/dist/TableModelInstanceBuilder.js +25 -23
- package/dist/TableSqlMap.d.ts +17 -18
- package/dist/TableSqlMap.js +84 -88
- package/dist/TemplateUtil.d.ts +21 -18
- package/dist/TemplateUtil.js +75 -86
- package/dist/index.d.ts +15 -15
- package/dist/index.js +16 -16
- package/package.json +29 -33
package/dist/SqlMapLoader.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import { TableSqlMap } from "./TableSqlMap.js";
|
|
2
|
+
import { BaseDaoType, TableModel } from "@eggjs/dal-decorator";
|
|
3
|
+
import { Logger } from "@eggjs/tegg-types";
|
|
4
|
+
|
|
5
|
+
//#region src/SqlMapLoader.d.ts
|
|
6
|
+
declare class SqlMapLoader {
|
|
7
|
+
private readonly logger;
|
|
8
|
+
private readonly tableModel;
|
|
9
|
+
private readonly clazzExtension;
|
|
10
|
+
constructor(tableModel: TableModel, baseDaoClazz: BaseDaoType, logger: Logger);
|
|
11
|
+
load(): TableSqlMap;
|
|
10
12
|
}
|
|
13
|
+
//#endregion
|
|
14
|
+
export { SqlMapLoader };
|
package/dist/SqlMapLoader.js
CHANGED
|
@@ -1,23 +1,25 @@
|
|
|
1
|
-
import { TableModel } from '@eggjs/dal-decorator';
|
|
2
1
|
import { BaseSqlMapGenerator } from "./BaseSqlMap.js";
|
|
3
2
|
import { TableSqlMap } from "./TableSqlMap.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
|
|
3
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
4
|
+
|
|
5
|
+
//#region src/SqlMapLoader.ts
|
|
6
|
+
var SqlMapLoader = class {
|
|
7
|
+
logger;
|
|
8
|
+
tableModel;
|
|
9
|
+
clazzExtension;
|
|
10
|
+
constructor(tableModel, baseDaoClazz, logger) {
|
|
11
|
+
this.clazzExtension = baseDaoClazz.clazzExtension;
|
|
12
|
+
this.logger = logger;
|
|
13
|
+
this.tableModel = tableModel;
|
|
14
|
+
}
|
|
15
|
+
load() {
|
|
16
|
+
const sqlMap = {
|
|
17
|
+
...new BaseSqlMapGenerator(this.tableModel, this.logger).load(),
|
|
18
|
+
...this.clazzExtension
|
|
19
|
+
};
|
|
20
|
+
return new TableSqlMap(this.tableModel.clazz.name, sqlMap);
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
//#endregion
|
|
25
|
+
export { SqlMapLoader };
|
package/dist/SqlUtil.d.ts
CHANGED
package/dist/SqlUtil.js
CHANGED
|
@@ -1,222 +1,193 @@
|
|
|
1
|
+
//#region src/SqlUtil.ts
|
|
1
2
|
function isWhiteChar(ch) {
|
|
2
|
-
|
|
3
|
+
return ch === " " || ch === "\n" || ch === "\r" || ch === " ";
|
|
3
4
|
}
|
|
4
|
-
const COMMENT_CHARS =
|
|
5
|
+
const COMMENT_CHARS = "-#/";
|
|
5
6
|
const MUL_CHAR_LEADING_COMMENT_FIRST_CHAR = {
|
|
6
|
-
|
|
7
|
-
|
|
7
|
+
MAY_BE_FIRST_COMMENT: "-",
|
|
8
|
+
MAY_BE_FIRST_BLOCK_COMMENT: "/"
|
|
8
9
|
};
|
|
9
10
|
const MUL_CHAR_LEADING_COMMENT_VERIFIER = {
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
MAY_BE_FIRST_COMMENT: "-",
|
|
12
|
+
MAY_BE_FIRST_BLOCK_COMMENT: "*"
|
|
12
13
|
};
|
|
13
14
|
const MUL_CHAR_LEADING_COMMENT_NEXT_STATE = {
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
MAY_BE_FIRST_COMMENT: "IN_COMMENT_WAIT_HINT",
|
|
16
|
+
MAY_BE_FIRST_BLOCK_COMMENT: "IN_BLOCK_COMMENT_WAIT_HINT"
|
|
16
17
|
};
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
state = 'SINGLE_QUOTE';
|
|
194
|
-
break;
|
|
195
|
-
case '"':
|
|
196
|
-
state = 'DOUBLE_QUOTE';
|
|
197
|
-
break;
|
|
198
|
-
case '-':
|
|
199
|
-
state = 'MAY_BE_FIRST_COMMENT';
|
|
200
|
-
break;
|
|
201
|
-
case '#':
|
|
202
|
-
state = 'IN_COMMENT';
|
|
203
|
-
break;
|
|
204
|
-
case '/':
|
|
205
|
-
state = 'MAY_BE_FIRST_BLOCK_COMMENT';
|
|
206
|
-
break;
|
|
207
|
-
default:
|
|
208
|
-
if (isWhiteChar(ch))
|
|
209
|
-
continue;
|
|
210
|
-
state = 'CONTENT';
|
|
211
|
-
}
|
|
212
|
-
if (!COMMENT_CHARS.includes(ch))
|
|
213
|
-
ret += ch;
|
|
214
|
-
break;
|
|
215
|
-
default:
|
|
216
|
-
throw new Error('Unexpected state machine while minifying SQL.');
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
return ret.trim();
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsVXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9TcWxVdGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFNBQVMsV0FBVyxDQUFDLEVBQVU7SUFDN0IsT0FBTyxFQUFFLEtBQUssR0FBRyxJQUFJLEVBQUUsS0FBSyxJQUFJLElBQUksRUFBRSxLQUFLLElBQUksSUFBSSxFQUFFLEtBQUssSUFBSSxDQUFDO0FBQ2pFLENBQUM7QUFFRCxNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUM7QUFDNUIsTUFBTSxtQ0FBbUMsR0FBRztJQUMxQyxvQkFBb0IsRUFBRSxHQUFHO0lBQ3pCLDBCQUEwQixFQUFFLEdBQUc7Q0FDaEMsQ0FBQztBQUNGLE1BQU0saUNBQWlDLEdBQUc7SUFDeEMsb0JBQW9CLEVBQUUsR0FBRztJQUN6QiwwQkFBMEIsRUFBRSxHQUFHO0NBQ2hDLENBQUM7QUFDRixNQUFNLG1DQUFtQyxHQUFHO0lBQzFDLG9CQUFvQixFQUFFLHNCQUFzQjtJQUM1QywwQkFBMEIsRUFBRSw0QkFBNEI7Q0FDekQsQ0FBQztBQUVGLE1BQU0sT0FBTyxPQUFPO0lBQ2xCLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBVztRQUN2QixJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFFYixJQUFJLEtBQUssR0FBRyxPQUFPLENBQUM7UUFDcEIsSUFBSSxhQUFhLENBQUM7UUFDbEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNwQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDbEIsUUFBUSxLQUFLLEVBQUUsQ0FBQztnQkFDZCxLQUFLLHNCQUFzQixDQUFDO2dCQUM1QixLQUFLLDRCQUE0QjtvQkFDL0IsUUFBUSxFQUFFLEVBQUUsQ0FBQzt3QkFDWCxLQUFLLEdBQUc7NEJBQ04sYUFBYSxHQUFHLGNBQWMs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
|
|
18
|
+
var SqlUtil = class {
|
|
19
|
+
static minify(sql) {
|
|
20
|
+
let ret = "";
|
|
21
|
+
let state = "START";
|
|
22
|
+
let tempNextState;
|
|
23
|
+
for (let i = 0; i < sql.length; i++) {
|
|
24
|
+
const ch = sql[i];
|
|
25
|
+
switch (state) {
|
|
26
|
+
case "MAY_BE_FIRST_COMMENT":
|
|
27
|
+
case "MAY_BE_FIRST_BLOCK_COMMENT":
|
|
28
|
+
switch (ch) {
|
|
29
|
+
case "\"":
|
|
30
|
+
tempNextState = "DOUBLE_QUOTE";
|
|
31
|
+
break;
|
|
32
|
+
case "'":
|
|
33
|
+
tempNextState = "SINGLE_QUOTE";
|
|
34
|
+
break;
|
|
35
|
+
case MUL_CHAR_LEADING_COMMENT_VERIFIER[state]:
|
|
36
|
+
tempNextState = MUL_CHAR_LEADING_COMMENT_NEXT_STATE[state];
|
|
37
|
+
break;
|
|
38
|
+
default:
|
|
39
|
+
tempNextState = "CONTENT";
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
if (ch !== MUL_CHAR_LEADING_COMMENT_VERIFIER[state]) ret += `${MUL_CHAR_LEADING_COMMENT_FIRST_CHAR[state]}${ch}`;
|
|
43
|
+
state = tempNextState;
|
|
44
|
+
break;
|
|
45
|
+
case "IN_COMMENT_WAIT_HINT":
|
|
46
|
+
if (ch !== "+") state = "IN_COMMENT";
|
|
47
|
+
else {
|
|
48
|
+
state = "IN_COMMENT_HINT";
|
|
49
|
+
ret += "--+";
|
|
50
|
+
}
|
|
51
|
+
break;
|
|
52
|
+
case "IN_BLOCK_COMMENT_WAIT_HINT":
|
|
53
|
+
if (ch !== "+") state = "IN_BLOCK_COMMENT";
|
|
54
|
+
else {
|
|
55
|
+
state = "IN_BLOCK_COMMENT_HINT";
|
|
56
|
+
ret += "/*+";
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
case "MAY_BE_LAST_BLOCK_COMMENT":
|
|
60
|
+
if (ch === "/") {
|
|
61
|
+
if (ret && !isWhiteChar(ret[ret.length - 1])) ret += " ";
|
|
62
|
+
state = "IN_SPACE";
|
|
63
|
+
} else state = "IN_BLOCK_COMMENT";
|
|
64
|
+
break;
|
|
65
|
+
case "MAY_BE_LAST_BLOCK_COMMENT_HINT":
|
|
66
|
+
ret += ch;
|
|
67
|
+
if (ch === "/") {
|
|
68
|
+
state = "IN_SPACE";
|
|
69
|
+
if (isWhiteChar(sql[i + 1])) ret += sql[i + 1];
|
|
70
|
+
} else state = "IN_BLOCK_COMMENT_HINT";
|
|
71
|
+
break;
|
|
72
|
+
case "IN_COMMENT":
|
|
73
|
+
if (ch === "\n" || ch === "\r") {
|
|
74
|
+
if (ret && !isWhiteChar(ret[ret.length - 1])) ret += " ";
|
|
75
|
+
state = "IN_SPACE";
|
|
76
|
+
}
|
|
77
|
+
break;
|
|
78
|
+
case "IN_COMMENT_HINT":
|
|
79
|
+
ret += ch;
|
|
80
|
+
if (ch === "\n" || ch === "\r") state = "IN_SPACE";
|
|
81
|
+
break;
|
|
82
|
+
case "IN_BLOCK_COMMENT":
|
|
83
|
+
if (ch === "*") state = "MAY_BE_LAST_BLOCK_COMMENT";
|
|
84
|
+
break;
|
|
85
|
+
case "IN_BLOCK_COMMENT_HINT":
|
|
86
|
+
ret += ch;
|
|
87
|
+
if (ch === "*") state = "MAY_BE_LAST_BLOCK_COMMENT_HINT";
|
|
88
|
+
break;
|
|
89
|
+
case "START":
|
|
90
|
+
if (isWhiteChar(ch)) continue;
|
|
91
|
+
switch (ch) {
|
|
92
|
+
case "\"":
|
|
93
|
+
state = "DOUBLE_QUOTE";
|
|
94
|
+
break;
|
|
95
|
+
case "'":
|
|
96
|
+
state = "SINGLE_QUOTE";
|
|
97
|
+
break;
|
|
98
|
+
case "-":
|
|
99
|
+
state = "MAY_BE_FIRST_COMMENT";
|
|
100
|
+
break;
|
|
101
|
+
case "#":
|
|
102
|
+
state = "IN_COMMENT";
|
|
103
|
+
break;
|
|
104
|
+
case "/":
|
|
105
|
+
state = "MAY_BE_FIRST_BLOCK_COMMENT";
|
|
106
|
+
break;
|
|
107
|
+
default:
|
|
108
|
+
state = "CONTENT";
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
if (!COMMENT_CHARS.includes(ch)) ret += ch;
|
|
112
|
+
break;
|
|
113
|
+
case "DOUBLE_QUOTE":
|
|
114
|
+
case "SINGLE_QUOTE":
|
|
115
|
+
switch (ch) {
|
|
116
|
+
case "\\":
|
|
117
|
+
state = `BACKSLASH_AFTER_${state}`;
|
|
118
|
+
break;
|
|
119
|
+
case "'":
|
|
120
|
+
if (state === "SINGLE_QUOTE") state = "QUOTE_DONE";
|
|
121
|
+
break;
|
|
122
|
+
case "\"":
|
|
123
|
+
if (state === "DOUBLE_QUOTE") state = "QUOTE_DONE";
|
|
124
|
+
break;
|
|
125
|
+
default: break;
|
|
126
|
+
}
|
|
127
|
+
ret += ch;
|
|
128
|
+
break;
|
|
129
|
+
case "BACKSLASH_AFTER_SINGLE_QUOTE":
|
|
130
|
+
case "BACKSLASH_AFTER_DOUBLE_QUOTE":
|
|
131
|
+
ret += ch;
|
|
132
|
+
state = state.substr(16);
|
|
133
|
+
break;
|
|
134
|
+
case "QUOTE_DONE":
|
|
135
|
+
case "CONTENT":
|
|
136
|
+
switch (ch) {
|
|
137
|
+
case "'":
|
|
138
|
+
state = "SINGLE_QUOTE";
|
|
139
|
+
break;
|
|
140
|
+
case "\"":
|
|
141
|
+
state = "DOUBLE_QUOTE";
|
|
142
|
+
break;
|
|
143
|
+
case "-":
|
|
144
|
+
state = "MAY_BE_FIRST_COMMENT";
|
|
145
|
+
break;
|
|
146
|
+
case "#":
|
|
147
|
+
state = "IN_COMMENT";
|
|
148
|
+
break;
|
|
149
|
+
case "/":
|
|
150
|
+
state = "MAY_BE_FIRST_BLOCK_COMMENT";
|
|
151
|
+
break;
|
|
152
|
+
default:
|
|
153
|
+
if (isWhiteChar(ch)) {
|
|
154
|
+
state = "IN_SPACE";
|
|
155
|
+
ret += " ";
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
state = "CONTENT";
|
|
159
|
+
}
|
|
160
|
+
if (!COMMENT_CHARS.includes(ch)) ret += ch;
|
|
161
|
+
break;
|
|
162
|
+
case "IN_SPACE":
|
|
163
|
+
switch (ch) {
|
|
164
|
+
case "'":
|
|
165
|
+
state = "SINGLE_QUOTE";
|
|
166
|
+
break;
|
|
167
|
+
case "\"":
|
|
168
|
+
state = "DOUBLE_QUOTE";
|
|
169
|
+
break;
|
|
170
|
+
case "-":
|
|
171
|
+
state = "MAY_BE_FIRST_COMMENT";
|
|
172
|
+
break;
|
|
173
|
+
case "#":
|
|
174
|
+
state = "IN_COMMENT";
|
|
175
|
+
break;
|
|
176
|
+
case "/":
|
|
177
|
+
state = "MAY_BE_FIRST_BLOCK_COMMENT";
|
|
178
|
+
break;
|
|
179
|
+
default:
|
|
180
|
+
if (isWhiteChar(ch)) continue;
|
|
181
|
+
state = "CONTENT";
|
|
182
|
+
}
|
|
183
|
+
if (!COMMENT_CHARS.includes(ch)) ret += ch;
|
|
184
|
+
break;
|
|
185
|
+
default: throw new Error("Unexpected state machine while minifying SQL.");
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
return ret.trim();
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
|
|
192
|
+
//#endregion
|
|
193
|
+
export { SqlUtil };
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
-
import { TableModel } from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
2
|
+
|
|
3
|
+
//#region src/TableModelInstanceBuilder.d.ts
|
|
4
|
+
declare class TableModelInstanceBuilder {
|
|
5
|
+
constructor(tableModel: TableModel, row: Record<string, any>);
|
|
6
|
+
static buildInstance<T>(tableModel: TableModel<T>, row: Record<string, any>): T;
|
|
7
|
+
static buildRow<T extends object>(instance: T, tableModel: TableModel<T>): Record<string, any>;
|
|
6
8
|
}
|
|
9
|
+
//#endregion
|
|
10
|
+
export { TableModelInstanceBuilder };
|
|
@@ -1,23 +1,25 @@
|
|
|
1
|
-
import { TableModel } from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
|
|
1
|
+
import { TableModel } from "@eggjs/dal-decorator";
|
|
2
|
+
|
|
3
|
+
//#region src/TableModelInstanceBuilder.ts
|
|
4
|
+
var TableModelInstanceBuilder = class TableModelInstanceBuilder {
|
|
5
|
+
constructor(tableModel, row) {
|
|
6
|
+
for (const [key, value] of Object.entries(row)) {
|
|
7
|
+
const column = tableModel.columns.find((t) => t.columnName === key);
|
|
8
|
+
Reflect.set(this, column?.propertyName ?? key, value);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
static buildInstance(tableModel, row) {
|
|
12
|
+
return Reflect.construct(TableModelInstanceBuilder, [tableModel, row], tableModel.clazz);
|
|
13
|
+
}
|
|
14
|
+
static buildRow(instance, tableModel) {
|
|
15
|
+
const result = {};
|
|
16
|
+
for (const column of tableModel.columns) {
|
|
17
|
+
const columnValue = Reflect.get(instance, column.propertyName);
|
|
18
|
+
if (typeof columnValue !== "undefined") result[`$${column.propertyName}`] = columnValue;
|
|
19
|
+
}
|
|
20
|
+
return result;
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
//#endregion
|
|
25
|
+
export { TableModelInstanceBuilder };
|
package/dist/TableSqlMap.d.ts
CHANGED
|
@@ -1,19 +1,18 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
generate(name: string, data: object, timezone: string): string;
|
|
17
|
-
getType(name: string): SqlType;
|
|
18
|
-
getTemplateString(name: string): string;
|
|
1
|
+
import { SqlMap, SqlType } from "@eggjs/tegg-types";
|
|
2
|
+
import { Template } from "nunjucks";
|
|
3
|
+
|
|
4
|
+
//#region src/TableSqlMap.d.ts
|
|
5
|
+
|
|
6
|
+
declare class TableSqlMap {
|
|
7
|
+
#private;
|
|
8
|
+
readonly name: string;
|
|
9
|
+
private readonly map;
|
|
10
|
+
private readonly blocks;
|
|
11
|
+
private readonly sqlGenerator;
|
|
12
|
+
constructor(name: string, map: Record<string, SqlMap>);
|
|
13
|
+
generate(name: string, data: object, timezone: string): string;
|
|
14
|
+
getType(name: string): SqlType;
|
|
15
|
+
getTemplateString(name: string): string;
|
|
19
16
|
}
|
|
17
|
+
//#endregion
|
|
18
|
+
export { TableSqlMap };
|