@eggjs/tegg-common-util - npm Package Compare versions

Comparing version 3.38.0 to 3.39.0

dist/src/ModuleConfig.d.ts

@@ -7,4 +7,5 @@ import type { InlineModuleReferenceConfig, ModuleConfig, ModuleReference, ModuleReferenceConfig, NpmModuleReferenceConfig, ReadModuleReferenceOptions } from '@eggjs/tegg-types';
 export declare class ModuleConfigUtil {
-    static moduleYamlPath(modulePath: string, env?: string): string;
-    static moduleJsonPath(modulePath: string, env?: string): string;
+    #private;
+    static configNames: string[] | undefined;
+    static setConfigNames(configNames: string[] | undefined): void;
     static readModuleReference(baseDir: string, options?: ReadModuleReferenceOptions): readonly ModuleReference[];
@@ -18,8 +19,4 @@ private static readModuleReferenceFromModuleJson;
     static readModuleNameSync(moduleDir: string, baseDir?: string): string;
-    static loadModuleConfig(moduleDir: string, baseDir?: string, env?: string): Promise<ModuleConfig | undefined>;
-    private static loadModuleJson;
-    private static loadModuleYaml;
-    static loadModuleConfigSync(moduleDir: string, baseDir?: string, env?: string): ModuleConfig | undefined;
-    private static loadModuleJsonSync;
-    private static loadModuleYamlSync;
+    static loadModuleConfig(moduleDir: string, baseDir?: string, env?: string): Promise<ModuleConfig>;
+    static loadModuleConfigSync(moduleDir: string, baseDir?: string, env?: string): ModuleConfig;
 }

dist/src/ModuleConfig.js

@@ -25,5 +25,11 @@ "use strict";
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a, _ModuleConfigUtil_loadOne, _ModuleConfigUtil_loadJson, _ModuleConfigUtil_loadYaml, _ModuleConfigUtil_loadOneSync, _ModuleConfigUtil_loadJsonSync, _ModuleConfigUtil_loadYamlSync;
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -51,14 +57,5 @@ exports.ModuleConfigUtil = exports.ModuleReferenceConfigHelp = void 0;
 class ModuleConfigUtil {
-    static moduleYamlPath(modulePath, env) {
-        if (env) {
-            return node_path_1.default.join(modulePath, `module.${env}.yml`);
-        }
-        return node_path_1.default.join(modulePath, 'module.yml');
+    static setConfigNames(configNames) {
+        _a.configNames = configNames;
     }
-    static moduleJsonPath(modulePath, env) {
-        if (env) {
-            return node_path_1.default.join(modulePath, `module.${env}.json`);
-        }
-        return node_path_1.default.join(modulePath, 'module.json');
-    }
     static readModuleReference(baseDir, options) {
@@ -88,3 +85,3 @@ // 1. module.json exits use module.json as module reference
                     path: modulePath,
-                    name: ModuleConfigUtil.readModuleNameSync(modulePath),
+                    name: _a.readModuleNameSync(modulePath),
                 };
@@ -96,3 +93,3 @@ }
                     path: modulePath,
-                    name: ModuleConfigUtil.readModuleNameSync(modulePath),
+                    name: _a.readModuleNameSync(modulePath),
                 };
@@ -213,84 +210,108 @@ }
     static async readModuleName(baseDir, moduleDir) {
-        moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
+        moduleDir = _a.resolveModuleDir(moduleDir, baseDir);
         const pkgContent = await node_fs_1.promises.readFile(node_path_1.default.join(moduleDir, 'package.json'), 'utf8');
         const pkg = JSON.parse(pkgContent);
-        return ModuleConfigUtil.getModuleName(pkg);
+        return _a.getModuleName(pkg);
     }
     static readModuleNameSync(moduleDir, baseDir) {
-        moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
+        moduleDir = _a.resolveModuleDir(moduleDir, baseDir);
         const pkgContent = node_fs_1.default.readFileSync(node_path_1.default.join(moduleDir, 'package.json'), 'utf8');
         const pkg = JSON.parse(pkgContent);
-        return ModuleConfigUtil.getModuleName(pkg);
+        return _a.getModuleName(pkg);
     }
     static async loadModuleConfig(moduleDir, baseDir, env) {
-        moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
-        let defaultConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir);
-        if (!defaultConfig) {
-            defaultConfig = await ModuleConfigUtil.loadModuleJson(moduleDir);
-        }
-        let envConfig;
+        const modulePath = _a.resolveModuleDir(moduleDir, baseDir);
+        let configNames;
         if (env) {
-            envConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir, env);
-            if (!envConfig) {
-                envConfig = await ModuleConfigUtil.loadModuleJson(moduleDir, env);
-            }
+            configNames = ['module', `module.${env}`];
         }
-        (0, extend2_1.default)(true, defaultConfig, envConfig);
-        return defaultConfig;
-    }
-    static async loadModuleJson(moduleDir, env) {
-        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
-        const moduleJsonPathExists = await FSUtil_1.FSUtil.fileExists(moduleJsonPath);
-        if (!moduleJsonPathExists) {
-            return;
+        else {
+            // assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
+            configNames = _a.configNames || ['module'];
         }
-        const moduleJsonContent = await node_fs_1.promises.readFile(moduleJsonPath, 'utf8');
-        const moduleJson = JSON.parse(moduleJsonContent);
-        return moduleJson.config;
-    }
-    static async loadModuleYaml(moduleDir, env) {
-        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
-        const moduleYamlPathExists = await FSUtil_1.FSUtil.fileExists(moduleYamlPath);
-        if (!moduleYamlPathExists) {
-            return;
+        const target = {};
+        for (const configName of configNames) {
+            let config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOne).call(_a, modulePath, configName);
+            // both module.yml and module.default.yml are ok for default config
+            if (configName === 'module.default' && !config) {
+                config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOne).call(_a, modulePath, 'module');
+            }
+            if (config) {
+                (0, extend2_1.default)(true, target, config);
+            }
         }
-        const moduleYamlContent = await node_fs_1.promises.readFile(moduleYamlPath, 'utf8');
-        return js_yaml_1.default.safeLoad(moduleYamlContent);
+        return target;
     }
     static loadModuleConfigSync(moduleDir, baseDir, env) {
-        moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
-        let defaultConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir);
-        if (!defaultConfig) {
-            defaultConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir);
-        }
-        let envConfig;
+        const modulePath = _a.resolveModuleDir(moduleDir, baseDir);
+        let configNames;
         if (env) {
-            envConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir, env);
-            if (!envConfig) {
-                envConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir, env);
-            }
+            configNames = ['module', `module.${env}`];
         }
-        return (0, extend2_1.default)(true, defaultConfig, envConfig);
-    }
-    static loadModuleJsonSync(moduleDir, env) {
-        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
-        const moduleJsonPathExists = node_fs_1.default.existsSync(moduleJsonPath);
-        if (!moduleJsonPathExists) {
-            return;
+        else {
+            // assert(ModuleConfigUtil.configNames, 'should setConfigNames before load module config');
+            configNames = _a.configNames || ['module'];
         }
-        const moduleJsonContent = node_fs_1.default.readFileSync(moduleJsonPath, 'utf8');
-        const moduleJson = JSON.parse(moduleJsonContent);
-        return moduleJson.config;
-    }
-    static loadModuleYamlSync(moduleDir, env) {
-        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
-        const moduleYamlPathExists = node_fs_1.default.existsSync(moduleYamlPath);
-        if (!moduleYamlPathExists) {
-            return;
+        const target = {};
+        for (const configName of configNames) {
+            let config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOneSync).call(_a, modulePath, configName);
+            // both module.yml and module.default.yml are ok for default config
+            if (configName === 'module.default' && !config) {
+                config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadOneSync).call(_a, modulePath, 'module');
+            }
+            if (config) {
+                (0, extend2_1.default)(true, target, config);
+            }
         }
-        const moduleYamlContent = node_fs_1.default.readFileSync(moduleYamlPath, 'utf8');
-        return js_yaml_1.default.safeLoad(moduleYamlContent);
+        return target;
     }
 }
 exports.ModuleConfigUtil = ModuleConfigUtil;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":"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"}
+_a = ModuleConfigUtil, _ModuleConfigUtil_loadOne = async function _ModuleConfigUtil_loadOne(moduleDir, configName) {
+    const yamlConfigPath = node_path_1.default.join(moduleDir, `${configName}.yml`);
+    let config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadYaml).call(_a, yamlConfigPath);
+    if (!config) {
+        const jsonConfigPath = node_path_1.default.join(moduleDir, `${configName}.json`);
+        config = await __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadJson).call(_a, jsonConfigPath);
+    }
+    return config;
+}, _ModuleConfigUtil_loadJson = async function _ModuleConfigUtil_loadJson(moduleJsonPath) {
+    const moduleJsonPathExists = await FSUtil_1.FSUtil.fileExists(moduleJsonPath);
+    if (!moduleJsonPathExists) {
+        return;
+    }
+    const moduleJsonContent = await node_fs_1.promises.readFile(moduleJsonPath, 'utf8');
+    const moduleJson = JSON.parse(moduleJsonContent);
+    return moduleJson.config;
+}, _ModuleConfigUtil_loadYaml = async function _ModuleConfigUtil_loadYaml(moduleYamlPath) {
+    const moduleYamlPathExists = await FSUtil_1.FSUtil.fileExists(moduleYamlPath);
+    if (!moduleYamlPathExists) {
+        return;
+    }
+    const moduleYamlContent = await node_fs_1.promises.readFile(moduleYamlPath, 'utf8');
+    return js_yaml_1.default.safeLoad(moduleYamlContent);
+}, _ModuleConfigUtil_loadOneSync = function _ModuleConfigUtil_loadOneSync(moduleDir, configName) {
+    const yamlConfigPath = node_path_1.default.join(moduleDir, `${configName}.yml`);
+    let config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadYamlSync).call(_a, yamlConfigPath);
+    if (!config) {
+        const jsonConfigPath = node_path_1.default.join(moduleDir, `${configName}.json`);
+        config = __classPrivateFieldGet(_a, _a, "m", _ModuleConfigUtil_loadJsonSync).call(_a, jsonConfigPath);
+    }
+    return config;
+}, _ModuleConfigUtil_loadJsonSync = function _ModuleConfigUtil_loadJsonSync(moduleJsonPath) {
+    const moduleJsonPathExists = node_fs_1.default.existsSync(moduleJsonPath);
+    if (!moduleJsonPathExists) {
+        return;
+    }
+    const moduleJsonContent = node_fs_1.default.readFileSync(moduleJsonPath, 'utf8');
+    const moduleJson = JSON.parse(moduleJsonContent);
+    return moduleJson.config;
+}, _ModuleConfigUtil_loadYamlSync = function _ModuleConfigUtil_loadYamlSync(moduleYamlPath) {
+    const moduleYamlPathExists = node_fs_1.default.existsSync(moduleYamlPath);
+    if (!moduleYamlPathExists) {
+        return;
+    }
+    const moduleYamlContent = node_fs_1.default.readFileSync(moduleYamlPath, 'utf8');
+    return js_yaml_1.default.safeLoad(moduleYamlContent);
+};
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@eggjs/tegg-common-util",
   "description": "common util for tegg",
-  "version": "3.38.0",
+  "version": "3.39.0",
   "keywords": [
@@ -39,3 +39,3 @@ "egg",
   "dependencies": {
-    "@eggjs/tegg-types": "^3.38.0",
+    "@eggjs/tegg-types": "^3.39.0",
     "extend2": "^1.0.0",
@@ -56,3 +56,3 @@ "globby": "^11.1.0",
   },
-  "gitHead": "8411e0707b00e732b94cfbf181a25b728a3b81fc"
+  "gitHead": "68c1a9cbbe6ef7e42a5c12de853641be6cfc7dd1"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

57029

increased by4.01%

Lines of code

747

increased by2.47%

Dependency changes

• Updated@eggjs/tegg-types@^3.39.0