@eggjs/dal-runtime 3.37.0 → 3.37.1
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/src/BaseSqlMap.d.ts +1 -1
- package/dist/src/BaseSqlMap.js +18 -18
- package/dist/src/CodeGenerator.d.ts +1 -1
- package/dist/src/CodeGenerator.js +4 -4
- package/dist/src/DataSource.d.ts +1 -1
- package/dist/src/SqlGenerator.d.ts +1 -1
- package/dist/src/SqlGenerator.js +54 -54
- package/dist/src/SqlMapLoader.d.ts +1 -1
- package/dist/src/TableModelInstanceBuilder.d.ts +1 -1
- package/dist/src/TableSqlMap.d.ts +1 -1
- package/dist/src/TableSqlMap.js +7 -7
- package/dist/src/TemplateUtil.d.ts +1 -1
- package/dist/src/TemplateUtil.js +19 -19
- package/package.json +3 -4
package/dist/src/BaseSqlMap.d.ts
CHANGED
package/dist/src/BaseSqlMap.js
CHANGED
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.BaseSqlMapGenerator = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
-
const
|
|
8
|
+
const dal_1 = require("@eggjs/tegg/dal");
|
|
9
9
|
const TemplateUtil_1 = require("./TemplateUtil");
|
|
10
10
|
class BaseSqlMapGenerator {
|
|
11
11
|
constructor(tableModel, logger) {
|
|
@@ -31,14 +31,14 @@ class BaseSqlMapGenerator {
|
|
|
31
31
|
.join(' AND ');
|
|
32
32
|
if (primary.keys.length === 1) {
|
|
33
33
|
result.push({
|
|
34
|
-
type:
|
|
34
|
+
type: dal_1.SqlType.SELECT,
|
|
35
35
|
name: `findBy${lodash_1.default.upperFirst(primary.keys[0].propertyName)}`,
|
|
36
36
|
sql,
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
result.push({
|
|
40
40
|
name: 'findByPrimary',
|
|
41
|
-
type:
|
|
41
|
+
type: dal_1.SqlType.SELECT,
|
|
42
42
|
sql,
|
|
43
43
|
});
|
|
44
44
|
return result;
|
|
@@ -47,7 +47,7 @@ class BaseSqlMapGenerator {
|
|
|
47
47
|
generateFindByIndexes() {
|
|
48
48
|
const sqlMaps = [];
|
|
49
49
|
for (const index of this.tableModel.indices) {
|
|
50
|
-
if (index.type ===
|
|
50
|
+
if (index.type === dal_1.IndexType.PRIMARY)
|
|
51
51
|
continue;
|
|
52
52
|
let sql = `SELECT ${this.generateAllColumns(true)}
|
|
53
53
|
FROM \`${this.tableModel.name}\`
|
|
@@ -60,12 +60,12 @@ class BaseSqlMapGenerator {
|
|
|
60
60
|
const tempName = lodash_1.default.upperFirst(lodash_1.default.camelCase(index.keys.length === 1 ? index.keys[0].propertyName : index.name));
|
|
61
61
|
sqlMaps.push({
|
|
62
62
|
name: `findBy${tempName}`,
|
|
63
|
-
type:
|
|
63
|
+
type: dal_1.SqlType.SELECT,
|
|
64
64
|
sql,
|
|
65
65
|
});
|
|
66
66
|
sqlMaps.push({
|
|
67
67
|
name: `findOneBy${tempName}`,
|
|
68
|
-
type:
|
|
68
|
+
type: dal_1.SqlType.SELECT,
|
|
69
69
|
sql: `${sql} LIMIT 0, 1`,
|
|
70
70
|
});
|
|
71
71
|
}
|
|
@@ -113,7 +113,7 @@ class BaseSqlMapGenerator {
|
|
|
113
113
|
{% endif %}
|
|
114
114
|
`).trim());
|
|
115
115
|
}
|
|
116
|
-
else if (column.type.type ===
|
|
116
|
+
else if (column.type.type === dal_1.ColumnType.JSON) {
|
|
117
117
|
values.push((`
|
|
118
118
|
{% if $${propertyName} !== undefined %}
|
|
119
119
|
{% if ___first %}
|
|
@@ -146,15 +146,15 @@ class BaseSqlMapGenerator {
|
|
|
146
146
|
// int:UNIX_TEIMESTAMP
|
|
147
147
|
// bigint: ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)
|
|
148
148
|
// datetime/timestamp Now()
|
|
149
|
-
if (type.type ===
|
|
149
|
+
if (type.type === dal_1.ColumnType.INT) {
|
|
150
150
|
// 秒级时间戳
|
|
151
151
|
now = 'UNIX_TIMESTAMP()';
|
|
152
152
|
}
|
|
153
|
-
else if (type.type ===
|
|
153
|
+
else if (type.type === dal_1.ColumnType.BIGINT) {
|
|
154
154
|
// 毫秒级时间戳
|
|
155
155
|
now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
|
|
156
156
|
}
|
|
157
|
-
else if (type.type ===
|
|
157
|
+
else if (type.type === dal_1.ColumnType.DATETIME || type.type === dal_1.ColumnType.TIMESTAMP) {
|
|
158
158
|
now = type.precision ? `NOW(${type.precision})` : 'NOW()';
|
|
159
159
|
}
|
|
160
160
|
else {
|
|
@@ -197,15 +197,15 @@ class BaseSqlMapGenerator {
|
|
|
197
197
|
for (const column of this.tableModel.columns) {
|
|
198
198
|
const { type, propertyName, columnName } = column;
|
|
199
199
|
let now;
|
|
200
|
-
if (type.type ===
|
|
200
|
+
if (type.type === dal_1.ColumnType.INT) {
|
|
201
201
|
// 秒级时间戳
|
|
202
202
|
now = 'UNIX_TIMESTAMP()';
|
|
203
203
|
}
|
|
204
|
-
else if (type.type ===
|
|
204
|
+
else if (type.type === dal_1.ColumnType.BIGINT) {
|
|
205
205
|
// 毫秒级时间戳
|
|
206
206
|
now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
|
|
207
207
|
}
|
|
208
|
-
else if (type.type ===
|
|
208
|
+
else if (type.type === dal_1.ColumnType.TIMESTAMP || type.type === dal_1.ColumnType.DATETIME) {
|
|
209
209
|
now = type.precision ? `NOW(${type.precision})` : 'NOW()';
|
|
210
210
|
}
|
|
211
211
|
// 若无更新时间字段，则自动更新该字段
|
|
@@ -254,7 +254,7 @@ class BaseSqlMapGenerator {
|
|
|
254
254
|
load() {
|
|
255
255
|
const map = {};
|
|
256
256
|
map.allColumns = {
|
|
257
|
-
type:
|
|
257
|
+
type: dal_1.SqlType.BLOCK,
|
|
258
258
|
content: this.generateAllColumns(false),
|
|
259
259
|
};
|
|
260
260
|
const sqlMaps = [
|
|
@@ -277,7 +277,7 @@ class BaseSqlMapGenerator {
|
|
|
277
277
|
*/
|
|
278
278
|
{
|
|
279
279
|
name: 'insert',
|
|
280
|
-
type:
|
|
280
|
+
type: dal_1.SqlType.INSERT,
|
|
281
281
|
sql: this.generateInsert(),
|
|
282
282
|
},
|
|
283
283
|
/**
|
|
@@ -285,7 +285,7 @@ class BaseSqlMapGenerator {
|
|
|
285
285
|
*/
|
|
286
286
|
{
|
|
287
287
|
name: 'update',
|
|
288
|
-
type:
|
|
288
|
+
type: dal_1.SqlType.UPDATE,
|
|
289
289
|
sql: this.generateUpdate(),
|
|
290
290
|
},
|
|
291
291
|
/**
|
|
@@ -293,7 +293,7 @@ class BaseSqlMapGenerator {
|
|
|
293
293
|
*/
|
|
294
294
|
{
|
|
295
295
|
name: 'delete',
|
|
296
|
-
type:
|
|
296
|
+
type: dal_1.SqlType.DELETE,
|
|
297
297
|
sql: this.generateDelete(),
|
|
298
298
|
},
|
|
299
299
|
];
|
|
@@ -307,4 +307,4 @@ class BaseSqlMapGenerator {
|
|
|
307
307
|
}
|
|
308
308
|
}
|
|
309
309
|
exports.BaseSqlMapGenerator = BaseSqlMapGenerator;
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
310
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BaseSqlMap.js","sourceRoot":"","sources":["../../src/BaseSqlMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const nunjucks_1 = __importDefault(require("nunjucks"));
|
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
10
|
const TemplateUtil_1 = require("./TemplateUtil");
|
|
11
|
-
const
|
|
11
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
12
12
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
13
13
|
const js_beautify_1 = require("js-beautify");
|
|
14
14
|
const SqlGenerator_1 = require("./SqlGenerator");
|
|
@@ -35,7 +35,7 @@ class CodeGenerator {
|
|
|
35
35
|
this.njkEnv.addFilter('dbTypeToTSType', TemplateUtil_1.TemplateUtil.dbTypeToTsType);
|
|
36
36
|
}
|
|
37
37
|
genCode(tplName, filePath, tableModel) {
|
|
38
|
-
let tableModelAbsolutePath =
|
|
38
|
+
let tableModelAbsolutePath = tegg_1.PrototypeUtil.getFilePath(tableModel.clazz);
|
|
39
39
|
tableModelAbsolutePath = tableModelAbsolutePath.substring(0, tableModelAbsolutePath.length - 3);
|
|
40
40
|
const data = {
|
|
41
41
|
table: tableModel,
|
|
@@ -59,7 +59,7 @@ class CodeGenerator {
|
|
|
59
59
|
const dalDir = node_path_1.default.join(this.moduleDir, 'dal');
|
|
60
60
|
// const tableName = tableModel.name;
|
|
61
61
|
// const clazzName = tableModel.clazz.name;
|
|
62
|
-
const clazzFileName = node_path_1.default.basename(
|
|
62
|
+
const clazzFileName = node_path_1.default.basename(tegg_1.PrototypeUtil.getFilePath(tableModel.clazz));
|
|
63
63
|
const baseFileName = node_path_1.default.basename(clazzFileName, '.ts');
|
|
64
64
|
// 要动的一些文件
|
|
65
65
|
const paths = {
|
|
@@ -125,4 +125,4 @@ class CodeGenerator {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
exports.CodeGenerator = CodeGenerator;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29kZUdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db2RlR2VuZXJhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHdEQUFzRDtBQUN0RCwwREFBNkI7QUFDN0Isb0RBQXVCO0FBQ3ZCLGlEQUE4QztBQUU5QyxzQ0FBNEM7QUFDNUMsZ0VBQWtDO0FBQ2xDLDZDQUEwQztBQUMxQyxpREFBOEM7QUFTOUMsSUFBWSxTQUlYO0FBSkQsV0FBWSxTQUFTO0lBQ25CLGtDQUFxQixDQUFBO0lBQ3JCLHdCQUFXLENBQUE7SUFDWCxvQ0FBdUIsQ0FBQTtBQUN6QixDQUFDLEVBSlcsU0FBUyx5QkFBVCxTQUFTLFFBSXBCO0FBRUQsTUFBYSxhQUFhO0lBTXhCLFlBQVksT0FBNkI7UUFDdkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQ25DLElBQUksQ0FBQyxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUNyQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLElBQUksYUFBYSxDQUFDO1FBQ2hELElBQUksQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sSUFBSSxpQkFBaUIsQ0FBQztRQUNsRCxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBSUQsaUJBQWlCO1FBQ2YsSUFBSSxDQUFDLE1BQU0sR0FBRyxrQkFBUSxDQUFDLFNBQVMsQ0FBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLEVBQUU7WUFDcEUsVUFBVSxFQUFFLEtBQUs7U0FDbEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxFQUFFLENBQUMsZ0JBQUMsQ0FBQyxVQUFVLENBQUMsZ0JBQUMsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxD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
|
package/dist/src/DataSource.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DataSource as IDataSource, PaginateData, SqlType, TableModel } from '@eggjs/dal
|
|
1
|
+
import { DataSource as IDataSource, PaginateData, SqlType, TableModel } from '@eggjs/tegg/dal';
|
|
2
2
|
import { MysqlDataSource } from './MySqlDataSource';
|
|
3
3
|
import { TableSqlMap } from './TableSqlMap';
|
|
4
4
|
export interface ExecuteSql {
|
package/dist/src/SqlGenerator.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SqlGenerator = void 0;
|
|
4
|
-
const
|
|
4
|
+
const dal_1 = require("@eggjs/tegg/dal");
|
|
5
5
|
// TODO diff 实现
|
|
6
6
|
class SqlGenerator {
|
|
7
7
|
formatComment(comment) {
|
|
@@ -20,15 +20,15 @@ class SqlGenerator {
|
|
|
20
20
|
sqls.push('NOT NULL');
|
|
21
21
|
}
|
|
22
22
|
if ([
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
23
|
+
dal_1.ColumnType.POINT,
|
|
24
|
+
dal_1.ColumnType.GEOMETRY,
|
|
25
|
+
dal_1.ColumnType.POINT,
|
|
26
|
+
dal_1.ColumnType.LINESTRING,
|
|
27
|
+
dal_1.ColumnType.POLYGON,
|
|
28
|
+
dal_1.ColumnType.MULTIPOINT,
|
|
29
|
+
dal_1.ColumnType.MULTILINESTRING,
|
|
30
|
+
dal_1.ColumnType.MULTIPOLYGON,
|
|
31
|
+
dal_1.ColumnType.GEOMETRYCOLLECTION,
|
|
32
32
|
].includes(column.type.type)) {
|
|
33
33
|
const SRID = column.type.SRID;
|
|
34
34
|
if (SRID) {
|
|
@@ -67,11 +67,11 @@ class SqlGenerator {
|
|
|
67
67
|
generateColumnType(columnType) {
|
|
68
68
|
const sqls = [];
|
|
69
69
|
switch (columnType.type) {
|
|
70
|
-
case
|
|
70
|
+
case dal_1.ColumnType.BOOL: {
|
|
71
71
|
sqls.push('BOOL');
|
|
72
72
|
break;
|
|
73
73
|
}
|
|
74
|
-
case
|
|
74
|
+
case dal_1.ColumnType.BIT: {
|
|
75
75
|
if (columnType.length) {
|
|
76
76
|
sqls.push(`BIT(${columnType.length})`);
|
|
77
77
|
}
|
|
@@ -80,11 +80,11 @@ class SqlGenerator {
|
|
|
80
80
|
}
|
|
81
81
|
break;
|
|
82
82
|
}
|
|
83
|
-
case
|
|
84
|
-
case
|
|
85
|
-
case
|
|
86
|
-
case
|
|
87
|
-
case
|
|
83
|
+
case dal_1.ColumnType.TINYINT:
|
|
84
|
+
case dal_1.ColumnType.SMALLINT:
|
|
85
|
+
case dal_1.ColumnType.MEDIUMINT:
|
|
86
|
+
case dal_1.ColumnType.INT:
|
|
87
|
+
case dal_1.ColumnType.BIGINT: {
|
|
88
88
|
if (typeof columnType.length === 'number') {
|
|
89
89
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
90
90
|
}
|
|
@@ -99,9 +99,9 @@ class SqlGenerator {
|
|
|
99
99
|
}
|
|
100
100
|
break;
|
|
101
101
|
}
|
|
102
|
-
case
|
|
103
|
-
case
|
|
104
|
-
case
|
|
102
|
+
case dal_1.ColumnType.DECIMAL:
|
|
103
|
+
case dal_1.ColumnType.FLOAT:
|
|
104
|
+
case dal_1.ColumnType.DOUBLE: {
|
|
105
105
|
if (typeof columnType.length === 'number' && typeof columnType.fractionalLength === 'number') {
|
|
106
106
|
sqls.push(`${columnType.type}(${columnType.length},${columnType.fractionalLength})`);
|
|
107
107
|
}
|
|
@@ -119,12 +119,12 @@ class SqlGenerator {
|
|
|
119
119
|
}
|
|
120
120
|
break;
|
|
121
121
|
}
|
|
122
|
-
case
|
|
122
|
+
case dal_1.ColumnType.DATE: {
|
|
123
123
|
sqls.push('DATE');
|
|
124
124
|
break;
|
|
125
125
|
}
|
|
126
|
-
case
|
|
127
|
-
case
|
|
126
|
+
case dal_1.ColumnType.DATETIME:
|
|
127
|
+
case dal_1.ColumnType.TIMESTAMP: {
|
|
128
128
|
if (columnType.precision) {
|
|
129
129
|
sqls.push(`${columnType.type}(${columnType.precision})`);
|
|
130
130
|
}
|
|
@@ -141,7 +141,7 @@ class SqlGenerator {
|
|
|
141
141
|
}
|
|
142
142
|
break;
|
|
143
143
|
}
|
|
144
|
-
case
|
|
144
|
+
case dal_1.ColumnType.TIME: {
|
|
145
145
|
if (columnType.precision) {
|
|
146
146
|
sqls.push(`${columnType.type}(${columnType.precision})`);
|
|
147
147
|
}
|
|
@@ -150,12 +150,12 @@ class SqlGenerator {
|
|
|
150
150
|
}
|
|
151
151
|
break;
|
|
152
152
|
}
|
|
153
|
-
case
|
|
153
|
+
case dal_1.ColumnType.YEAR: {
|
|
154
154
|
sqls.push('YEAR');
|
|
155
155
|
break;
|
|
156
156
|
}
|
|
157
|
-
case
|
|
158
|
-
case
|
|
157
|
+
case dal_1.ColumnType.CHAR:
|
|
158
|
+
case dal_1.ColumnType.TEXT: {
|
|
159
159
|
if (columnType.length) {
|
|
160
160
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
161
161
|
}
|
|
@@ -170,7 +170,7 @@ class SqlGenerator {
|
|
|
170
170
|
}
|
|
171
171
|
break;
|
|
172
172
|
}
|
|
173
|
-
case
|
|
173
|
+
case dal_1.ColumnType.VARCHAR: {
|
|
174
174
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
175
175
|
if (columnType.characterSet) {
|
|
176
176
|
sqls.push(`CHARACTER SET ${columnType.characterSet}`);
|
|
@@ -180,7 +180,7 @@ class SqlGenerator {
|
|
|
180
180
|
}
|
|
181
181
|
break;
|
|
182
182
|
}
|
|
183
|
-
case
|
|
183
|
+
case dal_1.ColumnType.BINARY: {
|
|
184
184
|
if (columnType.length) {
|
|
185
185
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
186
186
|
}
|
|
@@ -189,17 +189,17 @@ class SqlGenerator {
|
|
|
189
189
|
}
|
|
190
190
|
break;
|
|
191
191
|
}
|
|
192
|
-
case
|
|
192
|
+
case dal_1.ColumnType.VARBINARY: {
|
|
193
193
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
194
194
|
break;
|
|
195
195
|
}
|
|
196
|
-
case
|
|
196
|
+
case dal_1.ColumnType.TINYBLOB: {
|
|
197
197
|
sqls.push('TINYBLOB');
|
|
198
198
|
break;
|
|
199
199
|
}
|
|
200
|
-
case
|
|
201
|
-
case
|
|
202
|
-
case
|
|
200
|
+
case dal_1.ColumnType.TINYTEXT:
|
|
201
|
+
case dal_1.ColumnType.MEDIUMTEXT:
|
|
202
|
+
case dal_1.ColumnType.LONGTEXT: {
|
|
203
203
|
sqls.push(columnType.type);
|
|
204
204
|
if (columnType.characterSet) {
|
|
205
205
|
sqls.push(`CHARACTER SET ${columnType.characterSet}`);
|
|
@@ -209,7 +209,7 @@ class SqlGenerator {
|
|
|
209
209
|
}
|
|
210
210
|
break;
|
|
211
211
|
}
|
|
212
|
-
case
|
|
212
|
+
case dal_1.ColumnType.BLOB: {
|
|
213
213
|
if (columnType.length) {
|
|
214
214
|
sqls.push(`${columnType.type}(${columnType.length})`);
|
|
215
215
|
}
|
|
@@ -218,15 +218,15 @@ class SqlGenerator {
|
|
|
218
218
|
}
|
|
219
219
|
break;
|
|
220
220
|
}
|
|
221
|
-
case
|
|
221
|
+
case dal_1.ColumnType.MEDIUMBLOB: {
|
|
222
222
|
sqls.push('MEDIUMBLOB');
|
|
223
223
|
break;
|
|
224
224
|
}
|
|
225
|
-
case
|
|
225
|
+
case dal_1.ColumnType.LONGBLOB: {
|
|
226
226
|
sqls.push('LONGBLOB');
|
|
227
227
|
break;
|
|
228
228
|
}
|
|
229
|
-
case
|
|
229
|
+
case dal_1.ColumnType.ENUM: {
|
|
230
230
|
const enumValue = columnType.enums.map(t => `'${t}'`).join(',');
|
|
231
231
|
sqls.push(`ENUM(${enumValue})`);
|
|
232
232
|
if (columnType.characterSet) {
|
|
@@ -237,7 +237,7 @@ class SqlGenerator {
|
|
|
237
237
|
}
|
|
238
238
|
break;
|
|
239
239
|
}
|
|
240
|
-
case
|
|
240
|
+
case dal_1.ColumnType.SET: {
|
|
241
241
|
const enumValue = columnType.enums.map(t => `'${t}'`).join(',');
|
|
242
242
|
sqls.push(`SET(${enumValue})`);
|
|
243
243
|
if (columnType.characterSet) {
|
|
@@ -248,18 +248,18 @@ class SqlGenerator {
|
|
|
248
248
|
}
|
|
249
249
|
break;
|
|
250
250
|
}
|
|
251
|
-
case
|
|
251
|
+
case dal_1.ColumnType.JSON: {
|
|
252
252
|
sqls.push('JSON');
|
|
253
253
|
break;
|
|
254
254
|
}
|
|
255
|
-
case
|
|
256
|
-
case
|
|
257
|
-
case
|
|
258
|
-
case
|
|
259
|
-
case
|
|
260
|
-
case
|
|
261
|
-
case
|
|
262
|
-
case
|
|
255
|
+
case dal_1.ColumnType.GEOMETRY:
|
|
256
|
+
case dal_1.ColumnType.POINT:
|
|
257
|
+
case dal_1.ColumnType.LINESTRING:
|
|
258
|
+
case dal_1.ColumnType.POLYGON:
|
|
259
|
+
case dal_1.ColumnType.MULTIPOINT:
|
|
260
|
+
case dal_1.ColumnType.MULTILINESTRING:
|
|
261
|
+
case dal_1.ColumnType.MULTIPOLYGON:
|
|
262
|
+
case dal_1.ColumnType.GEOMETRYCOLLECTION: {
|
|
263
263
|
sqls.push(columnType.type);
|
|
264
264
|
break;
|
|
265
265
|
}
|
|
@@ -274,23 +274,23 @@ class SqlGenerator {
|
|
|
274
274
|
' ',
|
|
275
275
|
];
|
|
276
276
|
switch (indexModel.type) {
|
|
277
|
-
case
|
|
277
|
+
case dal_1.IndexType.INDEX: {
|
|
278
278
|
indexSql.push('KEY');
|
|
279
279
|
break;
|
|
280
280
|
}
|
|
281
|
-
case
|
|
281
|
+
case dal_1.IndexType.UNIQUE: {
|
|
282
282
|
indexSql.push('UNIQUE KEY');
|
|
283
283
|
break;
|
|
284
284
|
}
|
|
285
|
-
case
|
|
285
|
+
case dal_1.IndexType.PRIMARY: {
|
|
286
286
|
indexSql.push('PRIMARY KEY');
|
|
287
287
|
break;
|
|
288
288
|
}
|
|
289
|
-
case
|
|
289
|
+
case dal_1.IndexType.FULLTEXT: {
|
|
290
290
|
indexSql.push('FULLTEXT KEY');
|
|
291
291
|
break;
|
|
292
292
|
}
|
|
293
|
-
case
|
|
293
|
+
case dal_1.IndexType.SPATIAL: {
|
|
294
294
|
indexSql.push('SPATIAL KEY');
|
|
295
295
|
break;
|
|
296
296
|
}
|
|
@@ -392,4 +392,4 @@ class SqlGenerator {
|
|
|
392
392
|
}
|
|
393
393
|
}
|
|
394
394
|
exports.SqlGenerator = SqlGenerator;
|
|
395
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SqlGenerator.js","sourceRoot":"","sources":["../../src/SqlGenerator.ts"],"names":[],"mappings":"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"}
|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SqlGenerator.js","sourceRoot":"","sources":["../../src/SqlGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TableModel } from '@eggjs/dal
|
|
1
|
+
import { TableModel } from '@eggjs/tegg/dal';
|
|
2
2
|
export declare class TableModelInstanceBuilder {
|
|
3
3
|
constructor(tableModel: TableModel, row: Record<string, any>);
|
|
4
4
|
static buildInstance<T>(tableModel: TableModel<T>, row: Record<string, any>): any;
|
package/dist/src/TableSqlMap.js
CHANGED
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.TableSqlMap = void 0;
|
|
10
10
|
const NunjucksUtil_1 = require("./NunjucksUtil");
|
|
11
11
|
const TemplateUtil_1 = require("./TemplateUtil");
|
|
12
|
-
const
|
|
12
|
+
const dal_1 = require("@eggjs/tegg/dal");
|
|
13
13
|
class TableSqlMap {
|
|
14
14
|
constructor(name, map) {
|
|
15
15
|
_TableSqlMap_instances.add(this);
|
|
@@ -74,13 +74,13 @@ _TableSqlMap_instances = new WeakSet(), _TableSqlMap_extract = function _TableSq
|
|
|
74
74
|
continue;
|
|
75
75
|
const sqlMap = map[key];
|
|
76
76
|
switch (sqlMap.type) {
|
|
77
|
-
case
|
|
77
|
+
case dal_1.SqlType.BLOCK:
|
|
78
78
|
ret.blocks[key] = sqlMap.content || '';
|
|
79
79
|
break;
|
|
80
|
-
case
|
|
81
|
-
case
|
|
82
|
-
case
|
|
83
|
-
case
|
|
80
|
+
case dal_1.SqlType.INSERT:
|
|
81
|
+
case dal_1.SqlType.SELECT:
|
|
82
|
+
case dal_1.SqlType.UPDATE:
|
|
83
|
+
case dal_1.SqlType.DELETE:
|
|
84
84
|
default:
|
|
85
85
|
ret.sqlGenerator[key] = {
|
|
86
86
|
type: sqlMap.type,
|
|
@@ -92,4 +92,4 @@ _TableSqlMap_instances = new WeakSet(), _TableSqlMap_extract = function _TableSq
|
|
|
92
92
|
}
|
|
93
93
|
return ret;
|
|
94
94
|
};
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGVTcWxNYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVGFibGVTcWxNYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBRUEsaURBQStDO0FBQy9DLGlEQUE4QztBQUM5Qyx5Q0FBa0Q7QUFRbEQsTUFBYSxXQUFXO0lBTXRCLFlBQVksSUFBWSxFQUFFLEdBQTJCOztRQUNuRCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUVmLE1BQU0sR0FBRyxHQUFHLDRCQUFhLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLE1BQU0sU0FBUyxHQUFHLHVCQUFBLElBQUksb0RBQVMsTUFBYixJQUFJLEVBQVUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQztRQUMvQixJQUFJLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUM7UUFFM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDOUIscUJBQXFCO1lBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUM7Z0JBQUUsU0FBUztZQUMvQyxHQUFHLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkMsQ0FBQztRQUVELEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLDJCQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsR0FBRyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsMkJBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvQyxHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSwyQkFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLEdBQUcsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLDJCQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbkQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQUUsMkJBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNyRCxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSwyQkFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3pELEdBQUcsQ0FBQyxTQUFTLENBQUMsYUFBYSxFQUFFLDJCQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDdkQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSwyQkFBWSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQzdELEdBQUcsQ0FBQyxTQUFTLENBQUMsc0JBQXNCLEVBQUUsMkJBQVksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFtQ0QsUUFBUSxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsUUFBZ0I7UUFDbkQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxxQkFBcUI7UUFDckIsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQkFBcUIsSUFBSSxTQUFTLElBQUksSUFBSSxDQUFDLENBQUM7UUFDOUQsQ0FBQztRQUVELE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUM7UUFDbkMsUUFBZ0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztRQUMxQyxPQUFPLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELE9BQU8sQ0FBQyxJQUFZO1FBQ2xCLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUMscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLElBQUksU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFFRCxPQUFPLFNBQVMsQ0FBQyxJQUFJLENBQUM7SUFDeEIsQ0FBQztJQUVELGlCQUFpQixDQUFDLElBQVk7UUFDNUIsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxxQkFBcUI7UUFDckIsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQkFBcUIsSUFBSSxTQUFTLElBQUksSUFBSSxDQUFDLENBQUM7UUFDOUQsQ0FBQztRQUVELE9BQU8sU0FBUyxDQUFDLEdBQUcsQ0FBQztJQUN2QixDQUFDO0NBQ0Y7QUFoR0Qsa0NBZ0dDOzZGQWhFVSxHQUEyQjtJQUNsQyxNQUFNLEdBQUcsR0FBRztRQUNWLE1BQU0sRUFBRSxFQUFFO1FBQ1YsWUFBWSxFQUFFLEVBQUU7S0FDakIsQ0FBQztJQUVGLEtBQUssTUFBTSxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFDdEIscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQztZQUFFLFNBQVM7UUFFdkMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRXhCLFFBQVEsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ3BCLEtBQUssYUFBTyxDQUFDLEtBQUs7Z0JBQ2hCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ3ZDLE1BQU07WUFDUixLQUFLLGFBQU8sQ0FBQyxNQUFNLENBQUM7WUFDcEIsS0FBSyxhQUFPLENBQUMsTUFBTSxDQUFDO1lBQ3BCLEtBQUssYUFBTyxDQUFDLE1BQU0sQ0FBQztZQUNwQixLQUFLLGFBQU8sQ0FBQyxNQUFNLENBQUM7WUFDcEI7Z0JBQ0UsR0FBRyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRztvQkFDdEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJO29CQUNqQixRQUFRLEVBQUUsNEJBQWEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUM7b0JBQ2pFLEdBQUcsRUFBRSxNQUFNLENBQUMsR0FBRztpQkFDaEIsQ0FBQztnQkFDRixNQUFNO1FBQ1YsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMifQ==
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ColumnModel, ColumnType, Geometry, GeometryCollection, Line, MultiLine, MultiPoint, MultiPolygon, Point, Polygon } from '@eggjs/dal
|
|
1
|
+
import { ColumnModel, ColumnType, Geometry, GeometryCollection, Line, MultiLine, MultiPoint, MultiPolygon, Point, Polygon } from '@eggjs/tegg/dal';
|
|
2
2
|
export declare class TemplateUtil {
|
|
3
3
|
static isSpatialType(columnModel: ColumnModel): boolean;
|
|
4
4
|
static importPath(tableModelPath: string, currentPath: string): string;
|
package/dist/src/TemplateUtil.js
CHANGED
|
@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TemplateUtil = void 0;
|
|
7
7
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
-
const
|
|
8
|
+
const dal_1 = require("@eggjs/tegg/dal");
|
|
9
9
|
class TemplateUtil {
|
|
10
10
|
static isSpatialType(columnModel) {
|
|
11
11
|
switch (columnModel.type.type) {
|
|
12
|
-
case
|
|
13
|
-
case
|
|
14
|
-
case
|
|
15
|
-
case
|
|
16
|
-
case
|
|
17
|
-
case
|
|
18
|
-
case
|
|
19
|
-
case
|
|
12
|
+
case dal_1.ColumnType.GEOMETRY:
|
|
13
|
+
case dal_1.ColumnType.POINT:
|
|
14
|
+
case dal_1.ColumnType.LINESTRING:
|
|
15
|
+
case dal_1.ColumnType.POLYGON:
|
|
16
|
+
case dal_1.ColumnType.MULTIPOINT:
|
|
17
|
+
case dal_1.ColumnType.MULTILINESTRING:
|
|
18
|
+
case dal_1.ColumnType.MULTIPOLYGON:
|
|
19
|
+
case dal_1.ColumnType.GEOMETRYCOLLECTION: {
|
|
20
20
|
return true;
|
|
21
21
|
}
|
|
22
22
|
default: {
|
|
@@ -48,7 +48,7 @@ class TemplateUtil {
|
|
|
48
48
|
return `POLYGON(${lines.join(',')})`;
|
|
49
49
|
}
|
|
50
50
|
static toGeometry(val) {
|
|
51
|
-
const type =
|
|
51
|
+
const type = dal_1.SpatialHelper.getGeometryType(val);
|
|
52
52
|
const filterName = TemplateUtil.getSpatialFilter(type);
|
|
53
53
|
return TemplateUtil[filterName](val);
|
|
54
54
|
}
|
|
@@ -80,13 +80,13 @@ class TemplateUtil {
|
|
|
80
80
|
}
|
|
81
81
|
exports.TemplateUtil = TemplateUtil;
|
|
82
82
|
TemplateUtil.spatialFilter = {
|
|
83
|
-
[
|
|
84
|
-
[
|
|
85
|
-
[
|
|
86
|
-
[
|
|
87
|
-
[
|
|
88
|
-
[
|
|
89
|
-
[
|
|
90
|
-
[
|
|
83
|
+
[dal_1.ColumnType.POINT]: 'toPoint',
|
|
84
|
+
[dal_1.ColumnType.LINESTRING]: 'toLine',
|
|
85
|
+
[dal_1.ColumnType.POLYGON]: 'toPolygon',
|
|
86
|
+
[dal_1.ColumnType.GEOMETRY]: 'toGeometry',
|
|
87
|
+
[dal_1.ColumnType.MULTIPOINT]: 'toMultiPoint',
|
|
88
|
+
[dal_1.ColumnType.MULTILINESTRING]: 'toMultiLine',
|
|
89
|
+
[dal_1.ColumnType.MULTIPOLYGON]: 'toMultiPolygon',
|
|
90
|
+
[dal_1.ColumnType.GEOMETRYCOLLECTION]: 'toGeometryCollection',
|
|
91
91
|
};
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVtcGxhdGVVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1RlbXBsYXRlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwREFBNkI7QUFDN0IseUNBVXlCO0FBRXpCLE1BQWEsWUFBWTtJQUN2QixNQUFNLENBQUMsYUFBYSxDQUFDLFdBQXdCO1FBQzNDLFFBQVEsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM5QixLQUFLLGdCQUFVLENBQUMsUUFBUSxDQUFDO1lBQ3pCLEtBQUssZ0JBQVUsQ0FBQyxLQUFLLENBQUM7WUFDdEIsS0FBSyxnQkFBVSxDQUFDLFVBQVUsQ0FBQztZQUMzQixLQUFLLGdCQUFVLENBQUMsT0FBTyxDQUFDO1lBQ3hCLEtBQUssZ0JBQVUsQ0FBQyxVQUFVLENBQUM7WUFDM0IsS0FBSyxnQkFBVSxDQUFDLGVBQWUsQ0FBQztZQUNoQyxLQUFLLGdCQUFVLENBQUMsWUFBWSxDQUFDO1lBQzdCLEtBQUssZ0JBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7Z0JBQ25DLE9BQU8sSUFBSSxDQUFDO1lBQ2QsQ0FBQztZQUNELE9BQU8sQ0FBQyxDQUFDLENBQUM7Z0JBQ1IsT0FBTyxLQUFLLENBQUM7WUFDZixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQXNCLEVBQUUsV0FBbUI7UUFDM0QsT0FBTyxtQkFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVELE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBc0I7UUFDMUMsT0FBTyxpQkFBaUIsVUFBVSxJQUFJLENBQUM7SUFDekMsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBVTtRQUN0QixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxD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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/dal-runtime",
|
|
3
|
-
"version": "3.37.
|
|
3
|
+
"version": "3.37.1",
|
|
4
4
|
"description": "tegg dal decorator",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"egg",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"node": ">=14.0.0"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@eggjs/dal-decorator": "^3.37.0",
|
|
43
42
|
"@eggjs/rds": "^1.0.0",
|
|
43
|
+
"@eggjs/tegg": "^3.37.1",
|
|
44
44
|
"js-beautify": "^1.15.1",
|
|
45
45
|
"lodash": "^4.17.21",
|
|
46
46
|
"nunjucks": "^3.2.4",
|
|
@@ -51,7 +51,6 @@
|
|
|
51
51
|
"access": "public"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@eggjs/tegg": "^3.37.0",
|
|
55
54
|
"@types/lodash": "^4.17.0",
|
|
56
55
|
"@types/mocha": "^10.0.1",
|
|
57
56
|
"@types/node": "^20.2.4",
|
|
@@ -61,5 +60,5 @@
|
|
|
61
60
|
"ts-node": "^10.9.1",
|
|
62
61
|
"typescript": "^5.0.4"
|
|
63
62
|
},
|
|
64
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "5612b8fbf5bf131160c0db924534f6e232b2178e"
|
|
65
64
|
}
|