@eggjs/tegg-dal-plugin 3.39.1 → 3.39.3
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.
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.DalModuleLoadUnitHook = void 0;
|
|
7
4
|
const MysqlDataSourceManager_1 = require("./MysqlDataSourceManager");
|
|
8
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
9
5
|
const dal_runtime_1 = require("@eggjs/dal-runtime");
|
|
10
6
|
class DalModuleLoadUnitHook {
|
|
11
7
|
constructor(env, moduleConfigs) {
|
|
@@ -26,7 +22,7 @@ class DalModuleLoadUnitHook {
|
|
|
26
22
|
};
|
|
27
23
|
const forker = new dal_runtime_1.DatabaseForker(this.env, dataSourceOptions);
|
|
28
24
|
if (forker.shouldFork()) {
|
|
29
|
-
await forker.forkDb(
|
|
25
|
+
await forker.forkDb(loadUnit.unitPath);
|
|
30
26
|
}
|
|
31
27
|
try {
|
|
32
28
|
await MysqlDataSourceManager_1.MysqlDataSourceManager.instance.createDataSource(loadUnit.name, name, dataSourceOptions);
|
|
@@ -39,4 +35,4 @@ class DalModuleLoadUnitHook {
|
|
|
39
35
|
}
|
|
40
36
|
}
|
|
41
37
|
exports.DalModuleLoadUnitHook = DalModuleLoadUnitHook;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGFsTW9kdWxlTG9hZFVuaXRIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGFsTW9kdWxlTG9hZFVuaXRIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFFQUFrRTtBQUVsRSxvREFBdUU7QUFHdkUsTUFBYSxxQkFBcUI7SUFJaEMsWUFBWSxHQUFXLEVBQUUsYUFBaUQ7UUFDeEUsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsQ0FBQztJQUNyQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUEyQixFQUFFLFFBQWtCO1FBQzdELE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0QsSUFBSSxDQUFDLGtCQUFrQjtZQUFFLE9BQU87UUFDaEMsTUFBTSxnQkFBZ0IsR0FBbUQsa0JBQWtCLENBQUMsTUFBYyxDQUFDLFVBQVUsQ0FBQztRQUN0SCxJQUFJLENBQUMsZ0JBQWdCO1lBQUUsT0FBTztRQUM5QixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBRSxJQUFJLEVBQUUsTUFBTSxDQUFFLEVBQUUsRUFBRTtZQUNoRixNQUFNLGlCQUFpQixHQUFHO2dCQUN4QixHQUFHLE1BQU07Z0JBQ1QsSUFBSTthQUNMLENBQUM7WUFDRixNQUFNLE1BQU0sR0FBRyxJQUFJLDRCQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQy9ELElBQUksTUFBTSxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUM7Z0JBQ3hCLE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDekMsQ0FBQztZQUVELElBQUksQ0FBQztnQkFDSCxNQUFNLCtDQUFzQixDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQ2pHLENBQUM7WUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxPQUFPLEdBQUcsaUJBQWlCLFFBQVEsQ0FBQyxJQUFJLGVBQWUsSUFBSSxXQUFXLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQztnQkFDckYsTUFBTSxDQUFDLENBQUM7WUFDVixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNOLENBQUM7Q0FDRjtBQWhDRCxzREFnQ0MifQ==
|
|
@@ -10,14 +10,15 @@ class DalTableEggPrototypeHook {
|
|
|
10
10
|
this.logger = logger;
|
|
11
11
|
}
|
|
12
12
|
async preCreate(ctx) {
|
|
13
|
-
if (!dal_decorator_1.
|
|
13
|
+
if (!dal_decorator_1.DaoInfoUtil.getIsDao(ctx.clazz))
|
|
14
14
|
return;
|
|
15
|
-
const
|
|
15
|
+
const tableClazz = ctx.clazz.clazzModel;
|
|
16
|
+
const tableModel = dal_decorator_1.TableModel.build(tableClazz);
|
|
16
17
|
TableModelManager_1.TableModelManager.instance.set(ctx.loadUnit.name, tableModel);
|
|
17
|
-
const loader = new dal_runtime_1.SqlMapLoader(tableModel, ctx.
|
|
18
|
+
const loader = new dal_runtime_1.SqlMapLoader(tableModel, ctx.clazz, this.logger);
|
|
18
19
|
const sqlMap = loader.load();
|
|
19
20
|
SqlMapManager_1.SqlMapManager.instance.set(ctx.loadUnit.name, sqlMap);
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
23
|
exports.DalTableEggPrototypeHook = DalTableEggPrototypeHook;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGFsVGFibGVFZ2dQcm90b3R5cGVIb29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGFsVGFibGVFZ2dQcm90b3R5cGVIb29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHdEQUErRDtBQUMvRCxvREFBa0Q7QUFDbEQsMkRBQXdEO0FBQ3hELG1EQUFnRDtBQUVoRCxNQUFhLHdCQUF3QjtJQUduQyxZQUFZLE1BQWM7UUFDeEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBaUM7UUFDL0MsSUFBSSxDQUFDLDJCQUFXLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7WUFBRSxPQUFPO1FBQzdDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDO1FBQ3hDLE1BQU0sVUFBVSxHQUF1QiwwQkFBVSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNwRSxxQ0FBaUIsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzlELE1BQU0sTUFBTSxHQUFHLElBQUksMEJBQVksQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQzdCLDZCQUFhLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO0NBQ0Y7QUFoQkQsNERBZ0JDIn0=
|
package/lib/DataSource.js
CHANGED
|
@@ -14,8 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.DataSourceDelegate = void 0;
|
|
16
16
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
17
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
18
|
-
const node_fs_1 = __importDefault(require("node:fs"));
|
|
19
17
|
const tegg_1 = require("@eggjs/tegg");
|
|
20
18
|
const helper_1 = require("@eggjs/tegg/helper");
|
|
21
19
|
const dal_1 = require("@eggjs/tegg/dal");
|
|
@@ -70,23 +68,10 @@ exports.DataSourceDelegate = DataSourceDelegate = __decorate([
|
|
|
70
68
|
const config = helper_1.ModuleConfigUtil.loadModuleConfigSync(ctx.unitPath);
|
|
71
69
|
const dataSources = Object.keys((config === null || config === void 0 ? void 0 : config.dataSource) || {});
|
|
72
70
|
const result = [];
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
catch {
|
|
79
|
-
return [];
|
|
80
|
-
}
|
|
81
|
-
const daos = dirents.filter(t => t.endsWith(`DAO${helper_1.LoaderUtil.extension}`));
|
|
82
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
83
|
-
const daoClazzList = daos.map(t => {
|
|
84
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
85
|
-
return require(node_path_1.default.join(daoDir, t)).default;
|
|
86
|
-
});
|
|
87
|
-
const tableClazzList = daoClazzList.map(t => {
|
|
88
|
-
// eslint-disable-next-line no-proto
|
|
89
|
-
return Object.getPrototypeOf(t).clazzModel;
|
|
71
|
+
const loader = helper_1.LoaderFactory.createLoader(ctx.unitPath, helper_1.EggLoadUnitType.MODULE);
|
|
72
|
+
const clazzList = loader.load();
|
|
73
|
+
const tableClazzList = clazzList.filter(t => {
|
|
74
|
+
return dal_1.TableInfoUtil.getIsTable(t);
|
|
90
75
|
});
|
|
91
76
|
const dataSourceLength = dataSources.length;
|
|
92
77
|
for (const dataSource of dataSources) {
|
|
@@ -110,4 +95,4 @@ exports.DataSourceDelegate = DataSourceDelegate = __decorate([
|
|
|
110
95
|
},
|
|
111
96
|
})
|
|
112
97
|
], DataSourceDelegate);
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YVNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkRhdGFTb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWlDO0FBQ2pDLHNDQU9xQjtBQUNyQiwrQ0FNNEI7QUFDNUIseUNBT3lCO0FBQ3pCLG9EQUFnRDtBQUNoRCwyREFBd0Q7QUFDeEQscUVBQWtFO0FBQ2xFLG1EQUFnRDtBQWtDekMsSUFBTSxrQkFBa0IsR0FBeEIsTUFBTSxrQkFBa0I7SUFJdkIsQUFBTixLQUFLLENBQUMsSUFBSSxDQUFDLENBQTRCLEVBQUUsR0FBYztRQUNyRCxNQUFNLHdCQUF3QixHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLGtDQUE0QixDQUFDLENBQUM7UUFDdEYsNkRBQTZEO1FBQzdELE1BQU0sQ0FBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLFNBQVMsQ0FBRSxHQUFJLHdCQUFtQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM5RixNQUFNLFVBQVUsR0FBRyxxQ0FBaUIsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN6RSxJQUFBLHFCQUFNLEVBQUMsVUFBVSxFQUFFLG1CQUFtQix3QkFBd0IsRUFBRSxDQUFDLENBQUM7UUFDbEUsTUFBTSxlQUFlLEdBQUcsK0NBQXNCLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDcEYsSUFBQSxxQkFBTSxFQUFDLGVBQWUsRUFBRSx3QkFBd0IsVUFBVSxjQUFjLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDdEYsTUFBTSxNQUFNLEdBQUcsNkJBQWEsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNqRSxJQUFBLHFCQUFNLEVBQUMsTUFBTSxFQUFFLG9CQUFvQixTQUFTLGNBQWMsVUFBVSxFQUFFLENB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
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"eggModule": {
|
|
11
11
|
"name": "teggDal"
|
|
12
12
|
},
|
|
13
|
-
"version": "3.39.
|
|
13
|
+
"version": "3.39.3",
|
|
14
14
|
"description": "dal plugin for egg",
|
|
15
15
|
"keywords": [
|
|
16
16
|
"egg",
|
|
@@ -50,12 +50,12 @@
|
|
|
50
50
|
"node": ">=14.0.0"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@eggjs/dal-runtime": "^3.39.
|
|
53
|
+
"@eggjs/dal-runtime": "^3.39.3"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@eggjs/tegg-aop-plugin": "^3.39.
|
|
57
|
-
"@eggjs/tegg-config": "^3.39.
|
|
58
|
-
"@eggjs/tegg-plugin": "^3.39.
|
|
56
|
+
"@eggjs/tegg-aop-plugin": "^3.39.3",
|
|
57
|
+
"@eggjs/tegg-config": "^3.39.3",
|
|
58
|
+
"@eggjs/tegg-plugin": "^3.39.3",
|
|
59
59
|
"@types/mocha": "^10.0.1",
|
|
60
60
|
"@types/node": "^20.2.4",
|
|
61
61
|
"cross-env": "^7.0.3",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"publishConfig": {
|
|
71
71
|
"access": "public"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "494bc106c18570882319a2c5716e73e7129e9b27"
|
|
74
74
|
}
|