@eggjs/tegg-common-util 3.18.1 → 3.20.0

package/dist/src/ModuleConfig.d.ts

@@ -1,4 +1,5 @@
 export interface ModuleReference {
+    name: string;
     path: string;
 }
 export interface InlineModuleReferenceConfig {
@@ -20,19 +21,20 @@ export interface ReadModuleReferenceOptions {
     extraFilePattern?: string[];
 }
 export declare class ModuleConfigUtil {
-    static moduleYamlPath(modulePath: string): string;
-    static moduleJsonPath(modulePath: string): string;
+    static moduleYamlPath(modulePath: string, env?: string): string;
+    static moduleJsonPath(modulePath: string, env?: string): string;
     static readModuleReference(baseDir: string, options?: ReadModuleReferenceOptions): readonly ModuleReference[];
     private static readModuleReferenceFromModuleJson;
     private static readModuleReferenceFromScan;
     static readModuleFromNodeModules(baseDir: string): ModuleReference[];
     static resolveModuleDir(moduleDir: string, baseDir?: string): string;
+    private static getModuleName;
     static readModuleName(baseDir: string, moduleDir: string): Promise<string>;
     static readModuleNameSync(moduleDir: string, baseDir?: string): string;
-    static loadModuleConfig(moduleDir: string, baseDir?: string): Promise<ModuleConfig | undefined>;
+    static loadModuleConfig(moduleDir: string, baseDir?: string, env?: string): Promise<ModuleConfig | undefined>;
     private static loadModuleJson;
     private static loadModuleYaml;
-    static loadModuleConfigSync(moduleDir: string, baseDir?: string): ModuleConfig | undefined;
+    static loadModuleConfigSync(moduleDir: string, baseDir?: string, env?: string): ModuleConfig | undefined;
     private static loadModuleJsonSync;
     private static loadModuleYamlSync;
 }

package/dist/src/ModuleConfig.js

@@ -33,6 +33,7 @@ const fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const globby_1 = __importDefault(require("globby"));
 const FSUtil_1 = require("./FSUtil");
+const extend2_1 = __importDefault(require("extend2"));
 class ModuleReferenceConfigHelp {
     static isInlineModuleReference(moduleReference) {
         return !!moduleReference.path;
@@ -46,10 +47,16 @@ const DEFAULT_READ_MODULE_REF_OPTS = {
     deep: 10,
 };
 class ModuleConfigUtil {
-    static moduleYamlPath(modulePath) {
+    static moduleYamlPath(modulePath, env) {
+        if (env) {
+            return path_1.default.join(modulePath, `module.${env}.yml`);
+        }
         return path_1.default.join(modulePath, 'module.yml');
     }
-    static moduleJsonPath(modulePath) {
+    static moduleJsonPath(modulePath, env) {
+        if (env) {
+            return path_1.default.join(modulePath, `module.${env}.json`);
+        }
         return path_1.default.join(modulePath, 'module.json');
     }
     static readModuleReference(baseDir, options) {
@@ -73,13 +80,17 @@ class ModuleConfigUtil {
                 // path.posix for windows keep path as foo/package.json
                 const pkgJson = path_1.default.posix.join(moduleReferenceConfig.package, 'package.json');
                 const file = require.resolve(pkgJson, options);
+                const modulePath = path_1.default.dirname(file);
                 moduleReference = {
-                    path: path_1.default.dirname(file),
+                    path: modulePath,
+                    name: ModuleConfigUtil.readModuleNameSync(modulePath),
                 };
             }
             else if (ModuleReferenceConfigHelp.isInlineModuleReference(moduleReferenceConfig)) {
+                const modulePath = path_1.default.join(configDir, moduleReferenceConfig.path);
                 moduleReference = {
-                    path: path_1.default.join(configDir, moduleReferenceConfig.path),
+                    path: modulePath,
+                    name: ModuleConfigUtil.readModuleNameSync(modulePath),
                 };
             }
             else {
@@ -121,14 +132,16 @@ class ModuleConfigUtil {
                 continue;
             }
             moduleDirSet.add(moduleDir);
+            let name;
             try {
-                this.readModuleNameSync(moduleDir);
+                name = this.readModuleNameSync(moduleDir);
             }
             catch (_) {
                 continue;
             }
             ref.push({
                 path: moduleDir,
+                name,
             });
         }
         const moduleReferences = this.readModuleFromNodeModules(baseDir);
@@ -141,6 +154,7 @@ class ModuleConfigUtil {
             });
             ref.push({
                 path: moduleReference.path,
+                name: moduleReference.name,
             });
         }
         return ref;
@@ -168,11 +182,11 @@ class ModuleConfigUtil {
             const absolutePkgPath = path_1.default.dirname(packageJsonPath);
             const realPkgPath = fs_1.default.realpathSync(absolutePkgPath);
             try {
-                if (this.readModuleNameSync(realPkgPath)) {
-                    ref.push({
-                        path: realPkgPath,
-                    });
-                }
+                const name = this.readModuleNameSync(realPkgPath);
+                ref.push({
+                    path: realPkgPath,
+                    name,
+                });
             }
             catch (_) {
                 continue;
@@ -187,30 +201,40 @@ class ModuleConfigUtil {
         (0, assert_1.default)(baseDir, 'baseDir is required');
         return path_1.default.join(baseDir, 'config', moduleDir);
     }
+    static getModuleName(pkg) {
+        (0, assert_1.default)(pkg.eggModule && pkg.eggModule.name, 'eggModule.name not found in package.json');
+        return pkg.eggModule.name;
+    }
     static async readModuleName(baseDir, moduleDir) {
         moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
         const pkgContent = await fs_1.promises.readFile(path_1.default.join(moduleDir, 'package.json'), 'utf8');
         const pkg = JSON.parse(pkgContent);
-        (0, assert_1.default)(pkg.eggModule && pkg.eggModule.name, 'eggModule.name not found in package.json');
-        return pkg.eggModule.name;
+        return ModuleConfigUtil.getModuleName(pkg);
     }
     static readModuleNameSync(moduleDir, baseDir) {
         moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
         const pkgContent = fs_1.default.readFileSync(path_1.default.join(moduleDir, 'package.json'), 'utf8');
         const pkg = JSON.parse(pkgContent);
-        (0, assert_1.default)(pkg.eggModule && pkg.eggModule.name, 'eggModule.name not found in package.json');
-        return pkg.eggModule.name;
+        return ModuleConfigUtil.getModuleName(pkg);
     }
-    static async loadModuleConfig(moduleDir, baseDir) {
+    static async loadModuleConfig(moduleDir, baseDir, env) {
         moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
-        const yamlConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir);
-        if (yamlConfig) {
-            return yamlConfig;
+        let defaultConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir);
+        if (!defaultConfig) {
+            defaultConfig = await ModuleConfigUtil.loadModuleJson(moduleDir);
         }
-        return await ModuleConfigUtil.loadModuleJson(moduleDir);
+        let envConfig;
+        if (env) {
+            envConfig = await ModuleConfigUtil.loadModuleYaml(moduleDir, env);
+            if (!envConfig) {
+                envConfig = await ModuleConfigUtil.loadModuleJson(moduleDir, env);
+            }
+        }
+        (0, extend2_1.default)(true, defaultConfig, envConfig);
+        return defaultConfig;
     }
-    static async loadModuleJson(moduleDir) {
-        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir);
+    static async loadModuleJson(moduleDir, env) {
+        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
         const moduleJsonPathExists = await FSUtil_1.FSUtil.fileExists(moduleJsonPath);
         if (!moduleJsonPathExists) {
             return;
@@ -219,8 +243,8 @@ class ModuleConfigUtil {
         const moduleJson = JSON.parse(moduleJsonContent);
         return moduleJson.config;
     }
-    static async loadModuleYaml(moduleDir) {
-        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir);
+    static async loadModuleYaml(moduleDir, env) {
+        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
         const moduleYamlPathExists = await FSUtil_1.FSUtil.fileExists(moduleYamlPath);
         if (!moduleYamlPathExists) {
             return;
@@ -228,16 +252,24 @@ class ModuleConfigUtil {
         const moduleYamlContent = await fs_1.promises.readFile(moduleYamlPath, 'utf8');
         return js_yaml_1.default.safeLoad(moduleYamlContent);
     }
-    static loadModuleConfigSync(moduleDir, baseDir) {
+    static loadModuleConfigSync(moduleDir, baseDir, env) {
         moduleDir = ModuleConfigUtil.resolveModuleDir(moduleDir, baseDir);
-        const yamlConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir);
-        if (yamlConfig) {
-            return yamlConfig;
+        let defaultConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir);
+        if (!defaultConfig) {
+            defaultConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir);
+        }
+        let envConfig;
+        if (env) {
+            envConfig = ModuleConfigUtil.loadModuleYamlSync(moduleDir, env);
+            if (!envConfig) {
+                envConfig = ModuleConfigUtil.loadModuleJsonSync(moduleDir, env);
+            }
         }
-        return ModuleConfigUtil.loadModuleJsonSync(moduleDir);
+        (0, extend2_1.default)(true, defaultConfig, envConfig);
+        return defaultConfig;
     }
-    static loadModuleJsonSync(moduleDir) {
-        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir);
+    static loadModuleJsonSync(moduleDir, env) {
+        const moduleJsonPath = ModuleConfigUtil.moduleJsonPath(moduleDir, env);
         const moduleJsonPathExists = fs_1.default.existsSync(moduleJsonPath);
         if (!moduleJsonPathExists) {
             return;
@@ -246,8 +278,8 @@ class ModuleConfigUtil {
         const moduleJson = JSON.parse(moduleJsonContent);
         return moduleJson.config;
     }
-    static loadModuleYamlSync(moduleDir) {
-        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir);
+    static loadModuleYamlSync(moduleDir, env) {
+        const moduleYamlPath = ModuleConfigUtil.moduleYamlPath(moduleDir, env);
         const moduleYamlPathExists = fs_1.default.existsSync(moduleYamlPath);
         if (!moduleYamlPathExists) {
             return;
@@ -257,4 +289,4 @@ class ModuleConfigUtil {
     }
 }
 exports.ModuleConfigUtil = ModuleConfigUtil;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,sDAA2B;AAC3B,yCAA+C;AAC/C,gDAAwB;AACxB,oDAA4B;AAC5B,qCAAkC;AAgBlC,MAAa,yBAAyB;IACpC,MAAM,CAAC,uBAAuB,CAAC,eAAsC;QACnE,OAAO,CAAC,CAAE,eAA+C,CAAC,IAAI,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,eAAsC;QAChE,OAAO,CAAC,CAAE,eAA4C,CAAC,OAAO,CAAC;IACjE,CAAC;CACF;AARD,8DAQC;AAaD,MAAM,4BAA4B,GAAG;IACnC,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,MAAa,gBAAgB;IACpB,MAAM,CAAC,cAAc,CAAC,UAAkB;QAC7C,OAAO,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,UAAkB;QAC7C,OAAO,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,OAAe,EAAE,OAAoC;QACrF,2DAA2D;QAC3D,yEAAyE;QACzE,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,iCAAiC,CAAC,SAAS,EAAE,cAAc,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,KAAI,OAAO,CAAC,CAAC;SACnG;QACD,OAAO,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAEO,MAAM,CAAC,iCAAiC,CAAC,SAAiB,EAAE,cAAsB,EAAE,GAAY;QACtG,MAAM,iBAAiB,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,UAAU,GAA4B,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC1E,MAAM,mBAAmB,GAAsB,EAAE,CAAC;QAClD,KAAK,MAAM,qBAAqB,IAAI,UAAU,EAAE;YAC9C,IAAI,eAAgC,CAAC;YACrC,IAAI,yBAAyB,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,EAAE;gBACzE,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAE,GAAG,CAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,uDAAuD;gBACvD,MAAM,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;gBAC/E,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC/C,eAAe,GAAG;oBAChB,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC;iBACzB,CAAC;aACH;iBAAM,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,EAAE;gBACnF,eAAe,GAAG;oBAChB,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC;iBACvD,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;aACtG;YACD,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAC3C;QACD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEO,MAAM,CAAC,2BAA2B,CAAC,OAAe,EAAE,OAAoC;QAC9F,MAAM,GAAG,GAAsB,EAAE,CAAC;QAClC,MAAM,WAAW,GAA+B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,4BAA4B,EAAE,OAAO,CAAC,CAAC;QACzG,MAAM,YAAY,GAAG,gBAAM,CAAC,IAAI,CAAC;YAC/B,iBAAiB;YACjB,wBAAwB;YACxB,kBAAkB;YAClB,0BAA0B;YAC1B,cAAc;YACd,oBAAoB;YACpB,cAAc;YACd,GAAG,CAAC,WAAW,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACxC,EAAE;YACD,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACxD,IAAI,WAAW,CAAC;YAChB,IAAI;gBACF,WAAW,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;aAChD;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS;aACV;YAED,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE5C,yBAAyB;YACzB,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAC/B,SAAS;aACV;YACD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE5B,IAAI;gBACF,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS;aACV;YACD,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;SACJ;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACjE,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,MAAM,cAAc,GAAG,cAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC3D,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAChC,IAAI,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,cAAc,EAAE;oBAChD,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,cAAc,CAAC,CAAC;iBAC5E;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,eAAe,CAAC,IAAI;aAC3B,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,OAAe;QACrD,MAAM,GAAG,GAAsB,EAAE,CAAC;QAClC,IAAI,UAAkB,CAAC;QACvB,IAAI;YACF,UAAU,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,CAAC;SACX;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;YAC/D,IAAI,eAAuB,CAAC;YAC5B,IAAI;gBACF,4DAA4D;gBAC5D,mFAAmF;gBACnF,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,aAAa,eAAe,EAAE,EAAE,KAAK,EAAE,CAAE,OAAO,CAAE,EAAE,CAAC,CAAC;aAC5F;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS;aACV;YACD,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACtD,MAAM,WAAW,GAAG,YAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YACrD,IAAI;gBACF,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;oBACxC,GAAG,CAAC,IAAI,CAAC;wBACP,IAAI,EAAE,WAAW;qBAClB,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS;aACV;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,SAAiB,EAAE,OAAgB;QAChE,IAAI,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC9B,OAAO,SAAS,CAAC;SAClB;QACD,IAAA,gBAAM,EAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;QACvC,OAAO,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,SAAiB;QACnE,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,MAAM,aAAS,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,IAAA,gBAAM,EAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,0CAA0C,CAAC,CAAC;QACxF,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,SAAiB,EAAE,OAAgB;QAClE,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;QACjF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,IAAA,gBAAM,EAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,0CAA0C,CAAC,CAAC;QACxF,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAiB,EAAE,OAAgB;QACtE,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC;SACnB;QACD,OAAO,MAAM,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAiB;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjD,OAAO,UAAU,CAAC,MAAM,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAiB;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC3E,OAAO,iBAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAqB,CAAC;IAC9D,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,SAAiB,EAAE,OAAgB;QACpE,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC;SACnB;QACD,OAAO,gBAAgB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAAC,SAAiB;QACjD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjD,OAAO,UAAU,CAAC,MAAM,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAAC,SAAiB;QACjD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,CAAC,oBAAoB,EAAE;YACzB,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClE,OAAO,iBAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAiB,CAAC;IAC1D,CAAC;CACF;AA5ND,4CA4NC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ModuleConfig.js","sourceRoot":"","sources":["../../src/ModuleConfig.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eggjs/tegg-common-util",
   "description": "common util for tegg",
-  "version": "3.18.1",
+  "version": "3.20.0",
   "keywords": [
     "egg",
     "typescript",
@@ -36,6 +36,7 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
+    "extend2": "^1.0.0",
     "globby": "^11.1.0",
     "js-yaml": "^3.14.0"
   },
@@ -50,5 +51,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "265ac4ae37cad57cd7d38a0ea21d945a8f620b0c"
+  "gitHead": "a30835c9130c158489191e693f381f6c29706127"
 }