@eggjs/tegg-common-util 3.38.0 → 3.39.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.
Files changed (3) hide show
  1. package/dist/src/ModuleConfig.d.ts +5 -8
  2. package/dist/src/ModuleConfig.js +96 -75
  3. package/package.json +3 -3
package/dist/src/ModuleConfig.d.ts CHANGED
@@ -4,8 +4,9 @@ export declare class ModuleReferenceConfigHelp {
4
4
  static isNpmModuleReference(moduleReference: ModuleReferenceConfig): moduleReference is NpmModuleReferenceConfig;
5
5
  }
6
6
  export declare class ModuleConfigUtil {
7
- static moduleYamlPath(modulePath: string, env?: string): string;
8
- static moduleJsonPath(modulePath: string, env?: string): string;
7
+ #private;
8
+ static configNames: string[] | undefined;
9
+ static setConfigNames(configNames: string[] | undefined): void;
9
10
  static readModuleReference(baseDir: string, options?: ReadModuleReferenceOptions): readonly ModuleReference[];
10
11
  private static readModuleReferenceFromModuleJson;
11
12
  private static readModuleReferenceFromScan;
@@ -14,10 +15,6 @@ export declare class ModuleConfigUtil {
14
15
  private static getModuleName;
15
16
  static readModuleName(baseDir: string, moduleDir: string): Promise<string>;
16
17
  static readModuleNameSync(moduleDir: string, baseDir?: string): string;
17
- static loadModuleConfig(moduleDir: string, baseDir?: string, env?: string): Promise<ModuleConfig | undefined>;
18
- private static loadModuleJson;
19
- private static loadModuleYaml;
20
- static loadModuleConfigSync(moduleDir: string, baseDir?: string, env?: string): ModuleConfig | undefined;
21
- private static loadModuleJsonSync;
22
- private static loadModuleYamlSync;
18
+ static loadModuleConfig(moduleDir: string, baseDir?: string, env?: string): Promise<ModuleConfig>;
19
+ static loadModuleConfigSync(moduleDir: string, baseDir?: string, env?: string): ModuleConfig;
23
20
  }
package/dist/src/ModuleConfig.js CHANGED
@@ -22,9 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
+ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
26
+ if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
27
+ if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
28
+ return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
29
+ };
25
30
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
31
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
32
  };
33
+ var _a, _ModuleConfigUtil_loadOne, _ModuleConfigUtil_loadJson, _ModuleConfigUtil_loadYaml, _ModuleConfigUtil_loadOneSync, _ModuleConfigUtil_loadJsonSync, _ModuleConfigUtil_loadYamlSync;
28
34
  Object.defineProperty(exports, "__esModule", { value: true });
29
35
  exports.ModuleConfigUtil = exports.ModuleReferenceConfigHelp = void 0;
30
36
  const node_assert_1 = __importDefault(require("node:assert"));
@@ -47,17 +53,8 @@ const DEFAULT_READ_MODULE_REF_OPTS = {
47
53
  deep: 10,
48
54
  };
49
55
  class ModuleConfigUtil {
50
- static moduleYamlPath(modulePath, env) {
51
- if (env) {
52
- return node_path_1.default.join(modulePath, `module.${env}.yml`);
53
- }
54
- return node_path_1.default.join(modulePath, 'module.yml');
55
- }
56
- static moduleJsonPath(modulePath, env) {
57
- if (env) {
58
- return node_path_1.default.join(modulePath, `module.${env}.json`);
59
- }
60
- return node_path_1.default.join(modulePath, 'module.json');
56
+ static setConfigNames(configNames) {
57
+ _a.configNames = configNames;
61
58
  }
62
59
  static readModuleReference(baseDir, options) {
63
60
  // 1. module.json exits use module.json as module reference
@@ -83,14 +80,14 @@ class ModuleConfigUtil {
83
80
  const modulePath = node_path_1.default.dirname(file);
84
81
  moduleReference = {
85
82
  path: modulePath,
86
- name: ModuleConfigUtil.readModuleNameSync(modulePath),
83
+ name: _a.readModuleNameSync(modulePath),
87
84
  };
88
85
  }
89
86
  else if (ModuleReferenceConfigHelp.isInlineModuleReference(moduleReferenceConfig)) {
90
87
  const modulePath = node_path_1.default.join(configDir, moduleReferenceConfig.path);
91
88
  moduleReference = {
92
89
  path: modulePath,
93
- name: ModuleConfigUtil.readModuleNameSync(modulePath),
90
+ name: _a.readModuleNameSync(modulePath),
94
91
  };
95
92
  }
96
93
  else {
@@ -206,86 +203,110 @@ class ModuleConfigUtil {
206
203
  return pkg.eggModule.name;
207
204
  }
208
205
  static async readModuleName(baseDir, moduleDir) {
209
- moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
206
+ moduleDir = _a.resolveModuleDir(moduleDir, baseDir);
210
207
  const pkgContent = await node_fs_1.promises.readFile(node_path_1.default.join(moduleDir, 'package.json'), 'utf8');
211
208
  const pkg = JSON.parse(pkgContent);
212
- return ModuleConfigUtil.getModuleName(pkg);
209
+ return _a.getModuleName(pkg);
213
210
  }
214
211
  static readModuleNameSync(moduleDir, baseDir) {
215
- moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
212
+ moduleDir = _a.resolveModuleDir(moduleDir, baseDir);
216
213
  const pkgContent = node_fs_1.default.readFileSync(node_path_1.default.join(moduleDir, 'package.json'), 'utf8');
217
214
  const pkg = JSON.parse(pkgContent);
218
- return ModuleConfigUtil.getModuleName(pkg);
215
+ return _a.getModuleName(pkg);
219
216
  }
220
217
  static async loadModuleConfig(moduleDir, baseDir, env) {
221
- moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
222
- let defaultConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir);
223
- if (!defaultConfig) {
224
- defaultConfig = await ModuleConfigUtil.loadModuleJson(moduleDir);
225
- }
226
- let envConfig;
218
+ const modulePath = _a.resolveModuleDir(moduleDir, baseDir);
219
+ let configNames;
227
220
  if (env) {
228
- envConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir, env);
229
- if (!envConfig) {
230
- envConfig = await ModuleConfigUtil.loadModuleJson(moduleDir, env);
231
- }
221
+ configNames = ['module', `module.${env}`];
232
222
  }
233
- (0, extend2_1.default)(true, defaultConfig, envConfig);
234
- return defaultConfig;
235
- }
236
- static async loadModuleJson(moduleDir, env) {
237
- const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
238
- const moduleJsonPathExists = await FSUtil_1.FSUtil.fileExists(moduleJsonPath);
239
- if (!moduleJsonPathExists) {
240
- return;
223
+ else {
224
+ // assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
225
+ configNames = _a.configNames || ['module'];
241
226
  }
242
- const moduleJsonContent = await node_fs_1.promises.readFile(moduleJsonPath, 'utf8');
243
- const moduleJson = JSON.parse(moduleJsonContent);
244
- return moduleJson.config;
245
- }
246
- static async loadModuleYaml(moduleDir, env) {
247
- const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
248
- const moduleYamlPathExists = await FSUtil_1.FSUtil.fileExists(moduleYamlPath);
249
- if (!moduleYamlPathExists) {
250
- return;
227
+ const target = {};
228
+ for (const configName of configNames) {
229
+ let config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOne).call(_a, modulePath, configName);
230
+ // both module.yml and module.default.yml are ok for default config
231
+ if (configName === 'module.default' && !config) {
232
+ config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOne).call(_a, modulePath, 'module');
233
+ }
234
+ if (config) {
235
+ (0, extend2_1.default)(true, target, config);
236
+ }
251
237
  }
252
- const moduleYamlContent = await node_fs_1.promises.readFile(moduleYamlPath, 'utf8');
253
- return js_yaml_1.default.safeLoad(moduleYamlContent);
238
+ return target;
254
239
  }
255
240
  static loadModuleConfigSync(moduleDir, baseDir, env) {
256
- moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
257
- let defaultConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir);
258
- if (!defaultConfig) {
259
- defaultConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir);
260
- }
261
- let envConfig;
241
+ const modulePath = _a.resolveModuleDir(moduleDir, baseDir);
242
+ let configNames;
262
243
  if (env) {
263
- envConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir, env);
264
- if (!envConfig) {
265
- envConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir, env);
266
- }
244
+ configNames = ['module', `module.${env}`];
267
245
  }
268
- return (0, extend2_1.default)(true, defaultConfig, envConfig);
269
- }
270
- static loadModuleJsonSync(moduleDir, env) {
271
- const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
272
- const moduleJsonPathExists = node_fs_1.default.existsSync(moduleJsonPath);
273
- if (!moduleJsonPathExists) {
274
- return;
246
+ else {
247
+ // assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
248
+ configNames = _a.configNames || ['module'];
275
249
  }
276
- const moduleJsonContent = node_fs_1.default.readFileSync(moduleJsonPath, 'utf8');
277
- const moduleJson = JSON.parse(moduleJsonContent);
278
- return moduleJson.config;
279
- }
280
- static loadModuleYamlSync(moduleDir, env) {
281
- const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
282
- const moduleYamlPathExists = node_fs_1.default.existsSync(moduleYamlPath);
283
- if (!moduleYamlPathExists) {
284
- return;
250
+ const target = {};
251
+ for (const configName of configNames) {
252
+ let config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOneSync).call(_a, modulePath, configName);
253
+ // both module.yml and module.default.yml are ok for default config
254
+ if (configName === 'module.default' && !config) {
255
+ config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOneSync).call(_a, modulePath, 'module');
256
+ }
257
+ if (config) {
258
+ (0, extend2_1.default)(true, target, config);
259
+ }
285
260
  }
286
- const moduleYamlContent = node_fs_1.default.readFileSync(moduleYamlPath, 'utf8');
287
- return js_yaml_1.default.safeLoad(moduleYamlContent);
261
+ return target;
288
262
  }
289
263
  }
290
264
  exports.ModuleConfigUtil = ModuleConfigUtil;
291
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":"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"}
265
+ _a = ModuleConfigUtil, _ModuleConfigUtil_loadOne = async function _ModuleConfigUtil_loadOne(moduleDir, configName) {
266
+ const yamlConfigPath = node_path_1.default.join(moduleDir, `${configName}.yml`);
267
+ let config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadYaml).call(_a, yamlConfigPath);
268
+ if (!config) {
269
+ const jsonConfigPath = node_path_1.default.join(moduleDir, `${configName}.json`);
270
+ config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadJson).call(_a, jsonConfigPath);
271
+ }
272
+ return config;
273
+ }, _ModuleConfigUtil_loadJson = async function _ModuleConfigUtil_loadJson(moduleJsonPath) {
274
+ const moduleJsonPathExists = await FSUtil_1.FSUtil.fileExists(moduleJsonPath);
275
+ if (!moduleJsonPathExists) {
276
+ return;
277
+ }
278
+ const moduleJsonContent = await node_fs_1.promises.readFile(moduleJsonPath, 'utf8');
279
+ const moduleJson = JSON.parse(moduleJsonContent);
280
+ return moduleJson.config;
281
+ }, _ModuleConfigUtil_loadYaml = async function _ModuleConfigUtil_loadYaml(moduleYamlPath) {
282
+ const moduleYamlPathExists = await FSUtil_1.FSUtil.fileExists(moduleYamlPath);
283
+ if (!moduleYamlPathExists) {
284
+ return;
285
+ }
286
+ const moduleYamlContent = await node_fs_1.promises.readFile(moduleYamlPath, 'utf8');
287
+ return js_yaml_1.default.safeLoad(moduleYamlContent);
288
+ }, _ModuleConfigUtil_loadOneSync = function _ModuleConfigUtil_loadOneSync(moduleDir, configName) {
289
+ const yamlConfigPath = node_path_1.default.join(moduleDir, `${configName}.yml`);
290
+ let config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadYamlSync).call(_a, yamlConfigPath);
291
+ if (!config) {
292
+ const jsonConfigPath = node_path_1.default.join(moduleDir, `${configName}.json`);
293
+ config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadJsonSync).call(_a, jsonConfigPath);
294
+ }
295
+ return config;
296
+ }, _ModuleConfigUtil_loadJsonSync = function _ModuleConfigUtil_loadJsonSync(moduleJsonPath) {
297
+ const moduleJsonPathExists = node_fs_1.default.existsSync(moduleJsonPath);
298
+ if (!moduleJsonPathExists) {
299
+ return;
300
+ }
301
+ const moduleJsonContent = node_fs_1.default.readFileSync(moduleJsonPath, 'utf8');
302
+ const moduleJson = JSON.parse(moduleJsonContent);
303
+ return moduleJson.config;
304
+ }, _ModuleConfigUtil_loadYamlSync = function _ModuleConfigUtil_loadYamlSync(moduleYamlPath) {
305
+ const moduleYamlPathExists = node_fs_1.default.existsSync(moduleYamlPath);
306
+ if (!moduleYamlPathExists) {
307
+ return;
308
+ }
309
+ const moduleYamlContent = node_fs_1.default.readFileSync(moduleYamlPath, 'utf8');
310
+ return js_yaml_1.default.safeLoad(moduleYamlContent);
311
+ };
312
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@eggjs/tegg-common-util",
3
3
  "description": "common util for tegg",
4
- "version": "3.38.0",
4
+ "version": "3.39.1",
5
5
  "keywords": [
6
6
  "egg",
7
7
  "typescript",
@@ -36,7 +36,7 @@
36
36
  "node": ">=14.0.0"
37
37
  },
38
38
  "dependencies": {
39
- "@eggjs/tegg-types": "^3.38.0",
39
+ "@eggjs/tegg-types": "^3.39.1",
40
40
  "extend2": "^1.0.0",
41
41
  "globby": "^11.1.0",
42
42
  "js-yaml": "^3.14.0"
@@ -52,5 +52,5 @@
52
52
  "ts-node": "^10.9.1",
53
53
  "typescript": "^5.0.4"
54
54
  },
55
- "gitHead": "8411e0707b00e732b94cfbf181a25b728a3b81fc"
55
+ "gitHead": "ac91cdc19552d02bf98eae718a5b4466be284549"
56
56
  }