@eggjs/tegg-common-util 4.0.0-beta.7 → 4.0.0-beta.9
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/FSUtil.d.ts +2 -5
- package/dist/FSUtil.js +13 -16
- package/dist/Graph.d.ts +60 -63
- package/dist/Graph.js +159 -129
- package/dist/MapUtil.d.ts +2 -5
- package/dist/MapUtil.js +9 -10
- package/dist/ModuleConfig.d.ts +18 -22
- package/dist/ModuleConfig.js +280 -222
- package/dist/ModuleConfigs.d.ts +6 -9
- package/dist/ModuleConfigs.js +10 -13
- package/dist/NameUtil.d.ts +2 -5
- package/dist/NameUtil.js +6 -9
- package/dist/ObjectUtils.d.ts +5 -9
- package/dist/ObjectUtils.js +51 -29
- package/dist/ProxyUtil.d.ts +2 -5
- package/dist/ProxyUtil.js +14 -12
- package/dist/StackUtil.d.ts +2 -5
- package/dist/StackUtil.js +46 -36
- package/dist/TimerUtil.d.ts +2 -5
- package/dist/TimerUtil.js +6 -9
- package/dist/index.d.ts +12 -13
- package/dist/index.js +13 -15
- package/package.json +3 -3
package/dist/ModuleConfig.js
CHANGED
|
@@ -1,224 +1,282 @@
|
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import fs, { promises as fsPromise } from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { extend } from 'extend2';
|
|
5
|
+
import { globbySync } from 'globby';
|
|
6
|
+
import { load as yamlLoad } from 'js-yaml';
|
|
7
|
+
import { importResolve } from '@eggjs/utils';
|
|
1
8
|
import { FSUtil } from "./FSUtil.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
static isInlineModuleReference(moduleReference) {
|
|
13
|
-
return !!moduleReference.path;
|
|
14
|
-
}
|
|
15
|
-
static isNpmModuleReference(moduleReference) {
|
|
16
|
-
return !!moduleReference.package;
|
|
17
|
-
}
|
|
9
|
+
export class ModuleReferenceConfigHelp {
|
|
10
|
+
static isInlineModuleReference(moduleReference) {
|
|
11
|
+
return !!moduleReference.path;
|
|
12
|
+
}
|
|
13
|
+
static isNpmModuleReference(moduleReference) {
|
|
14
|
+
return !!moduleReference.package;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
const DEFAULT_READ_MODULE_REF_OPTS = {
|
|
18
|
+
deep: 10,
|
|
18
19
|
};
|
|
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
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
20
|
+
export class ModuleConfigUtil {
|
|
21
|
+
static configNames;
|
|
22
|
+
static setConfigNames(configNames) {
|
|
23
|
+
ModuleConfigUtil.configNames = configNames;
|
|
24
|
+
}
|
|
25
|
+
static readModuleReference(baseDir, options) {
|
|
26
|
+
// 1. module.json exits use module.json as module reference
|
|
27
|
+
// 1. module.json not exits scan baseDir get package.json to find modules
|
|
28
|
+
const configDir = path.join(baseDir, 'config');
|
|
29
|
+
const moduleJsonPath = path.join(configDir, 'module.json');
|
|
30
|
+
if (fs.existsSync(moduleJsonPath)) {
|
|
31
|
+
return this.readModuleReferenceFromModuleJson(configDir, moduleJsonPath, options?.cwd || baseDir);
|
|
32
|
+
}
|
|
33
|
+
return this.readModuleReferenceFromScan(baseDir, options);
|
|
34
|
+
}
|
|
35
|
+
static readModuleReferenceFromModuleJson(configDir, moduleJsonPath, cwd) {
|
|
36
|
+
const moduleJsonContent = fs.readFileSync(moduleJsonPath, 'utf8');
|
|
37
|
+
const moduleJson = JSON.parse(moduleJsonContent);
|
|
38
|
+
const moduleReferenceList = [];
|
|
39
|
+
for (const moduleReferenceConfig of moduleJson) {
|
|
40
|
+
let moduleReference;
|
|
41
|
+
if (ModuleReferenceConfigHelp.isNpmModuleReference(moduleReferenceConfig)) {
|
|
42
|
+
const options = cwd ? { paths: [cwd] } : {};
|
|
43
|
+
// path.posix for windows keep path as foo/package.json
|
|
44
|
+
const pkgJson = path.posix.join(moduleReferenceConfig.package, 'package.json');
|
|
45
|
+
const file = importResolve(pkgJson, options);
|
|
46
|
+
const modulePath = path.dirname(file);
|
|
47
|
+
moduleReference = {
|
|
48
|
+
path: modulePath,
|
|
49
|
+
name: ModuleConfigUtil.readModuleNameSync(modulePath),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
else if (ModuleReferenceConfigHelp.isInlineModuleReference(moduleReferenceConfig)) {
|
|
53
|
+
const modulePath = path.join(configDir, moduleReferenceConfig.path);
|
|
54
|
+
moduleReference = {
|
|
55
|
+
path: modulePath,
|
|
56
|
+
name: ModuleConfigUtil.readModuleNameSync(modulePath),
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
throw new Error('unknown type of module reference config: ' + JSON.stringify(moduleReferenceConfig));
|
|
61
|
+
}
|
|
62
|
+
moduleReferenceList.push(moduleReference);
|
|
63
|
+
}
|
|
64
|
+
return moduleReferenceList;
|
|
65
|
+
}
|
|
66
|
+
static readModuleReferenceFromScan(baseDir, options) {
|
|
67
|
+
const ref = [];
|
|
68
|
+
const realOptions = Object.assign({}, DEFAULT_READ_MODULE_REF_OPTS, options);
|
|
69
|
+
const packagePaths = globbySync([
|
|
70
|
+
'**/package.json',
|
|
71
|
+
// not load node_modules
|
|
72
|
+
'!**/node_modules',
|
|
73
|
+
// not load files in .xxx/
|
|
74
|
+
'!**/+(.*)/**',
|
|
75
|
+
// not load coverage
|
|
76
|
+
'!**/coverage',
|
|
77
|
+
...(realOptions.extraFilePattern || []),
|
|
78
|
+
], {
|
|
79
|
+
cwd: baseDir,
|
|
80
|
+
deep: realOptions.deep,
|
|
81
|
+
});
|
|
82
|
+
const moduleDirSet = new Set();
|
|
83
|
+
for (const packagePath of packagePaths) {
|
|
84
|
+
const absolutePkgPath = path.join(baseDir, packagePath);
|
|
85
|
+
let realPkgPath;
|
|
86
|
+
try {
|
|
87
|
+
realPkgPath = fs.realpathSync(absolutePkgPath);
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
const moduleDir = path.dirname(realPkgPath);
|
|
93
|
+
// skip the symbolic link
|
|
94
|
+
if (moduleDirSet.has(moduleDir)) {
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
moduleDirSet.add(moduleDir);
|
|
98
|
+
let name;
|
|
99
|
+
try {
|
|
100
|
+
name = this.readModuleNameSync(moduleDir);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
ref.push({
|
|
106
|
+
path: moduleDir,
|
|
107
|
+
name,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
const moduleReferences = this.readModuleFromNodeModules(baseDir);
|
|
111
|
+
for (const moduleReference of moduleReferences) {
|
|
112
|
+
const moduleBasePath = path.basename(moduleReference.path);
|
|
113
|
+
moduleDirSet.forEach(modulePath => {
|
|
114
|
+
if (path.basename(modulePath) === moduleBasePath) {
|
|
115
|
+
throw new Error('duplicate import of module reference: ' + moduleBasePath);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
ref.push({
|
|
119
|
+
path: moduleReference.path,
|
|
120
|
+
name: moduleReference.name,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
return ref;
|
|
124
|
+
}
|
|
125
|
+
static readModuleFromNodeModules(baseDir) {
|
|
126
|
+
const ref = [];
|
|
127
|
+
let pkgContent;
|
|
128
|
+
try {
|
|
129
|
+
pkgContent = fs.readFileSync(path.join(baseDir, 'package.json'), 'utf8');
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return [];
|
|
133
|
+
}
|
|
134
|
+
const pkg = JSON.parse(pkgContent);
|
|
135
|
+
for (const dependencyKey of Object.keys(pkg.dependencies || {})) {
|
|
136
|
+
let packageJsonPath;
|
|
137
|
+
try {
|
|
138
|
+
// https://nodejs.org/api/packages.html#package-entry-points
|
|
139
|
+
// ignore cases where the package entry is exports but package.json is not exported
|
|
140
|
+
packageJsonPath = importResolve(`${dependencyKey}/package.json`, { paths: [baseDir] });
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
const absolutePkgPath = path.dirname(packageJsonPath);
|
|
146
|
+
const realPkgPath = fs.realpathSync(absolutePkgPath);
|
|
147
|
+
try {
|
|
148
|
+
const name = this.readModuleNameSync(realPkgPath);
|
|
149
|
+
ref.push({
|
|
150
|
+
path: realPkgPath,
|
|
151
|
+
name,
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return ref;
|
|
159
|
+
}
|
|
160
|
+
static resolveModuleDir(moduleDir, baseDir) {
|
|
161
|
+
if (path.isAbsolute(moduleDir)) {
|
|
162
|
+
return moduleDir;
|
|
163
|
+
}
|
|
164
|
+
assert(baseDir, 'baseDir is required');
|
|
165
|
+
return path.join(baseDir, 'config', moduleDir);
|
|
166
|
+
}
|
|
167
|
+
static getModuleName(pkg) {
|
|
168
|
+
assert(pkg.eggModule && pkg.eggModule.name, 'eggModule.name not found in package.json');
|
|
169
|
+
return pkg.eggModule.name;
|
|
170
|
+
}
|
|
171
|
+
static async readModuleName(baseDir, moduleDir) {
|
|
172
|
+
moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
|
|
173
|
+
const pkgContent = await fsPromise.readFile(path.join(moduleDir, 'package.json'), 'utf8');
|
|
174
|
+
const pkg = JSON.parse(pkgContent);
|
|
175
|
+
return ModuleConfigUtil.getModuleName(pkg);
|
|
176
|
+
}
|
|
177
|
+
static readModuleNameSync(moduleDir, baseDir) {
|
|
178
|
+
moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
|
|
179
|
+
const pkgContent = fs.readFileSync(path.join(moduleDir, 'package.json'), 'utf8');
|
|
180
|
+
const pkg = JSON.parse(pkgContent);
|
|
181
|
+
return ModuleConfigUtil.getModuleName(pkg);
|
|
182
|
+
}
|
|
183
|
+
static async loadModuleConfig(moduleDir, baseDir, env) {
|
|
184
|
+
const modulePath = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
|
|
185
|
+
let configNames;
|
|
186
|
+
if (env) {
|
|
187
|
+
configNames = ['module', `module.${env}`];
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
// assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
|
|
191
|
+
configNames = ModuleConfigUtil.configNames || ['module'];
|
|
192
|
+
}
|
|
193
|
+
const target = {};
|
|
194
|
+
for (const configName of configNames) {
|
|
195
|
+
let config = await ModuleConfigUtil.#loadOne(modulePath, configName);
|
|
196
|
+
// both module.yml and module.default.yml are ok for default config
|
|
197
|
+
if (configName === 'module.default' && !config) {
|
|
198
|
+
config = await ModuleConfigUtil.#loadOne(modulePath, 'module');
|
|
199
|
+
}
|
|
200
|
+
if (config) {
|
|
201
|
+
extend(true, target, config);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
return target;
|
|
205
|
+
}
|
|
206
|
+
static async #loadOne(moduleDir, configName) {
|
|
207
|
+
const yamlConfigPath = path.join(moduleDir, `${configName}.yml`);
|
|
208
|
+
let config = await ModuleConfigUtil.#loadYaml(yamlConfigPath);
|
|
209
|
+
if (!config) {
|
|
210
|
+
const jsonConfigPath = path.join(moduleDir, `${configName}.json`);
|
|
211
|
+
config = await ModuleConfigUtil.#loadJson(jsonConfigPath);
|
|
212
|
+
}
|
|
213
|
+
return config;
|
|
214
|
+
}
|
|
215
|
+
static async #loadJson(moduleJsonPath) {
|
|
216
|
+
const moduleJsonPathExists = await FSUtil.fileExists(moduleJsonPath);
|
|
217
|
+
if (!moduleJsonPathExists) {
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
220
|
+
const moduleJsonContent = await fsPromise.readFile(moduleJsonPath, 'utf8');
|
|
221
|
+
const moduleJson = JSON.parse(moduleJsonContent);
|
|
222
|
+
return moduleJson.config;
|
|
223
|
+
}
|
|
224
|
+
static async #loadYaml(moduleYamlPath) {
|
|
225
|
+
const moduleYamlPathExists = await FSUtil.fileExists(moduleYamlPath);
|
|
226
|
+
if (!moduleYamlPathExists) {
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
const moduleYamlContent = await fsPromise.readFile(moduleYamlPath, 'utf8');
|
|
230
|
+
return yamlLoad(moduleYamlContent);
|
|
231
|
+
}
|
|
232
|
+
static loadModuleConfigSync(moduleDir, baseDir, env) {
|
|
233
|
+
const modulePath = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
|
|
234
|
+
let configNames;
|
|
235
|
+
if (env) {
|
|
236
|
+
configNames = ['module', `module.${env}`];
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
// assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
|
|
240
|
+
configNames = ModuleConfigUtil.configNames || ['module'];
|
|
241
|
+
}
|
|
242
|
+
const target = {};
|
|
243
|
+
for (const configName of configNames) {
|
|
244
|
+
let config = ModuleConfigUtil.#loadOneSync(modulePath, configName);
|
|
245
|
+
// both module.yml and module.default.yml are ok for default config
|
|
246
|
+
if (configName === 'module.default' && !config) {
|
|
247
|
+
config = ModuleConfigUtil.#loadOneSync(modulePath, 'module');
|
|
248
|
+
}
|
|
249
|
+
if (config) {
|
|
250
|
+
extend(true, target, config);
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
return target;
|
|
254
|
+
}
|
|
255
|
+
static #loadOneSync(moduleDir, configName) {
|
|
256
|
+
const yamlConfigPath = path.join(moduleDir, `${configName}.yml`);
|
|
257
|
+
let config = ModuleConfigUtil.#loadYamlSync(yamlConfigPath);
|
|
258
|
+
if (!config) {
|
|
259
|
+
const jsonConfigPath = path.join(moduleDir, `${configName}.json`);
|
|
260
|
+
config = ModuleConfigUtil.#loadJsonSync(jsonConfigPath);
|
|
261
|
+
}
|
|
262
|
+
return config;
|
|
263
|
+
}
|
|
264
|
+
static #loadJsonSync(moduleJsonPath) {
|
|
265
|
+
const moduleJsonPathExists = fs.existsSync(moduleJsonPath);
|
|
266
|
+
if (!moduleJsonPathExists) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
const moduleJsonContent = fs.readFileSync(moduleJsonPath, 'utf8');
|
|
270
|
+
const moduleJson = JSON.parse(moduleJsonContent);
|
|
271
|
+
return moduleJson.config;
|
|
272
|
+
}
|
|
273
|
+
static #loadYamlSync(moduleYamlPath) {
|
|
274
|
+
const moduleYamlPathExists = fs.existsSync(moduleYamlPath);
|
|
275
|
+
if (!moduleYamlPathExists) {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
const moduleYamlContent = fs.readFileSync(moduleYamlPath, 'utf8');
|
|
279
|
+
return yamlLoad(moduleYamlContent);
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../src/ModuleConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/ModuleConfigs.d.ts
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import { ModuleConfig
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
constructor(inner: Record<string, ModuleConfigHolder>);
|
|
7
|
-
get(moduleName: string): ModuleConfig$1 | undefined;
|
|
1
|
+
import type { ModuleConfig, ModuleConfigHolder } from '@eggjs/tegg-types';
|
|
2
|
+
export declare class ModuleConfigs {
|
|
3
|
+
readonly inner: Record<string, ModuleConfigHolder>;
|
|
4
|
+
constructor(inner: Record<string, ModuleConfigHolder>);
|
|
5
|
+
get(moduleName: string): ModuleConfig | undefined;
|
|
8
6
|
}
|
|
9
|
-
|
|
10
|
-
export { type ModuleConfig$1 as ModuleConfig, ModuleConfigs };
|
|
7
|
+
export type { ModuleConfig };
|
package/dist/ModuleConfigs.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
//#endregion
|
|
13
|
-
export { ModuleConfigs };
|
|
1
|
+
export class ModuleConfigs {
|
|
2
|
+
inner;
|
|
3
|
+
constructor(inner) {
|
|
4
|
+
this.inner = inner;
|
|
5
|
+
}
|
|
6
|
+
get(moduleName) {
|
|
7
|
+
return this.inner[moduleName]?.config;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlQ29uZmlncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9Nb2R1bGVDb25maWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sT0FBTyxhQUFhO0lBQ2YsS0FBSyxDQUFxQztJQUVuRCxZQUFZLEtBQXlDO1FBQ25ELElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxHQUFHLENBQUMsVUFBa0I7UUFDcEIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QyxDQUFDO0NBQ0YifQ==
|
package/dist/NameUtil.d.ts
CHANGED
package/dist/NameUtil.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
//#endregion
|
|
9
|
-
export { NameUtil };
|
|
1
|
+
export class NameUtil {
|
|
2
|
+
static getClassName(constructor) {
|
|
3
|
+
return constructor.name[0].toLowerCase() + constructor.name.substring(1);
|
|
4
|
+
}
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTmFtZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvTmFtZVV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFFBQVE7SUFDbkIsTUFBTSxDQUFDLFlBQVksQ0FBQyxXQUFxQjtRQUN2QyxPQUFPLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDM0UsQ0FBQztDQUNGIn0=
|
package/dist/ObjectUtils.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import { EggProtoImplClass } from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
static getFunctionArgNameList(func: Function): string[];
|
|
7
|
-
static getConstructorArgNameList(clazz: EggProtoImplClass): string[];
|
|
1
|
+
import type { EggProtoImplClass } from '@eggjs/tegg-types';
|
|
2
|
+
export declare class ObjectUtils {
|
|
3
|
+
static getProperties(obj: object): string[];
|
|
4
|
+
static getFunctionArgNameList(func: Function): string[];
|
|
5
|
+
static getConstructorArgNameList(clazz: EggProtoImplClass): string[];
|
|
8
6
|
}
|
|
9
|
-
//#endregion
|
|
10
|
-
export { ObjectUtils };
|