@eggjs/tegg-common-util 0.1.19 → 1.1.0

package/CHANGELOG.md

@@ -2,3 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [0.2.0](https://github.com/eggjs/tegg/compare/v0.1.19...v0.2.0) (2022-01-20)
+
+**Note:** Version bump only for package @eggjs/tegg-common-util

package/dist/src/ModuleConfig.d.ts

@@ -1,10 +1,22 @@
 export interface ModuleReference {
     path: string;
 }
+export interface InlineModuleReferenceConfig {
+    path: string;
+}
+export interface NpmModuleReferenceConfig {
+    package: string;
+}
+export declare type ModuleReferenceConfig = InlineModuleReferenceConfig | NpmModuleReferenceConfig;
+export declare class ModuleReferenceConfigHelp {
+    static isInlineModuleReference(moduleReference: ModuleReferenceConfig): moduleReference is InlineModuleReferenceConfig;
+    static isNpmModuleReference(moduleReference: ModuleReferenceConfig): moduleReference is NpmModuleReferenceConfig;
+}
 export interface ModuleConfig {
 }
 export interface ReadModuleReferenceOptions {
     deep?: number;
+    cwd?: string;
 }
 export declare class ModuleConfigUtil {
     static moduleYamlPath(modulePath: string): string;

package/dist/src/ModuleConfig.js

@@ -22,13 +22,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleConfigUtil = void 0;
+exports.ModuleConfigUtil = exports.ModuleReferenceConfigHelp = void 0;
 const assert_1 = __importDefault(require("assert"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const globby_1 = __importDefault(require("globby"));
 const FSUtil_1 = require("./FSUtil");
+class ModuleReferenceConfigHelp {
+    static isInlineModuleReference(moduleReference) {
+        return !!moduleReference.path;
+    }
+    static isNpmModuleReference(moduleReference) {
+        return !!moduleReference.package;
+    }
+}
+exports.ModuleReferenceConfigHelp = ModuleReferenceConfigHelp;
 const DEFAULT_READ_MODULE_REF_OPTS = {
     deep: 10,
 };
@@ -45,17 +54,35 @@ class ModuleConfigUtil {
         const configDir = path_1.default.join(baseDir, 'config');
         const moduleJsonPath = path_1.default.join(configDir, 'module.json');
         if (fs_1.default.existsSync(moduleJsonPath)) {
-            return this.readModuleReferenceFromModuleJson(configDir, moduleJsonPath);
+            return this.readModuleReferenceFromModuleJson(configDir, moduleJsonPath, options === null || options === void 0 ? void 0 : options.cwd);
         }
         return this.readModuleReferenceFromScan(baseDir, options);
     }
-    static readModuleReferenceFromModuleJson(configDir, moduleJsonPath) {
+    static readModuleReferenceFromModuleJson(configDir, moduleJsonPath, cwd) {
         const moduleJsonContent = fs_1.default.readFileSync(moduleJsonPath, 'utf8');
         const moduleJson = JSON.parse(moduleJsonContent);
-        for (const moduleReference of moduleJson) {
-            moduleReference.path = path_1.default.resolve(configDir, moduleReference.path);
+        const moduleReferenceList = [];
+        for (const moduleReferenceConfig of moduleJson) {
+            let moduleReference;
+            if (ModuleReferenceConfigHelp.isNpmModuleReference(moduleReferenceConfig)) {
+                const options = cwd ? { paths: [cwd] } : {};
+                const pkgJson = path_1.default.join(moduleReferenceConfig.package, 'package.json');
+                const file = require.resolve(pkgJson, options);
+                moduleReference = {
+                    path: path_1.default.dirname(file),
+                };
+            }
+            else if (ModuleReferenceConfigHelp.isInlineModuleReference(moduleReferenceConfig)) {
+                moduleReference = {
+                    path: path_1.default.join(configDir, moduleReferenceConfig.path),
+                };
+            }
+            else {
+                throw new Error('unknown type of module reference config: ' + JSON.stringify(moduleReferenceConfig));
+            }
+            moduleReferenceList.push(moduleReference);
         }
-        return moduleJson;
+        return moduleReferenceList;
     }
     static readModuleReferenceFromScan(baseDir, options) {
         const ref = [];
@@ -171,4 +198,4 @@ class ModuleConfigUtil {
     }
 }
 exports.ModuleConfigUtil = ModuleConfigUtil;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kdWxlQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL01vZHVsZUNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLHNEQUEyQjtBQUMzQix5Q0FBK0M7QUFDL0MsZ0RBQXdCO0FBQ3hCLG9EQUE0QjtBQUM1QixxQ0FBa0M7QUFlbEMsTUFBTSw0QkFBNEIsR0FBRztJQUNuQyxJQUFJLEVBQUUsRUFBRTtDQUNULENBQUM7QUFFRixNQUFhLGdCQUFnQjtJQUNwQixNQUFNLENBQUMsY0FBYyxDQUFDLFVBQWtCO1FBQzdDLE9BQU8sY0FBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBa0I7UUFDN0MsT0FBTyxjQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRU0sTUFBTSxDQUFDLG1CQUFtQixDQUFDLE9BQWUsRUFBRSxPQUFvQztRQUNyRiwyREFBMkQ7UUFDM0QseUVBQXlFO1FBQ3pFLE1BQU0sU0FBUyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sY0FBYyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQzNELElBQUksWUFBRSxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsRUFBRTtZQUNqQyxPQUFPLElBQUksQ0FBQyxpQ0FBaUMsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUM7U0FDMUU7UUFDRCxPQUFPLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVPLE1BQU0sQ0FBQyxpQ0FBaUMsQ0FBQyxTQUFpQixF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
+//# 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": "0.1.19",
+  "version": "1.1.0",
   "keywords": [
     "egg",
     "typescript",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "094f33ec812f41896ef78e8b4d2a7e3487646211"
+  "gitHead": "9d0b34fd6c73565145f3a2af63f10cd0509ff7fe"
 }