@cabloy/module-glob 1.0.0 → 5.0.0

package/dist/index.d.ts

@@ -1,15 +1,14 @@
-declare const _default: {
-    glob: typeof eggBornMglob;
-};
-export default _default;
-declare function eggBornMglob(options: any): {
-    suites: {};
-    modules: {};
-    modulesArray: never[];
-    modulesLocal: {};
-    modulesGlobal: {};
-    modulesMonkey: {};
-    suitesLocal: {};
-    suitesVendor: {};
-};
+import { IModuleGlobOptions } from './interface.js';
+import { IModule, ISuite } from '@cabloy/module-info';
+export * from './interface.js';
+export declare function glob(options: IModuleGlobOptions): Promise<{
+    suites: Record<string, ISuite>;
+    modules: Record<string, IModule>;
+    modulesArray: IModule[];
+    modulesLocal: Record<string, IModule>;
+    modulesGlobal: Record<string, IModule>;
+    modulesMonkey: Record<string, IModule>;
+    suitesLocal: Record<string, ISuite>;
+    suitesVendor: Record<string, ISuite>;
+}>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,92 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require('path');
-const fse = require('fs-extra');
-const semver = require('semver');
-const chalk = require('chalk');
-const boxen = require('boxen');
-const eggBornUtils = require('egg-born-utils');
-const mparse = require('@cabloy/module-parse').default;
-const boxenOptions = { padding: 1, margin: 1, align: 'center', borderColor: 'yellow', borderStyle: 'round' };
-exports.default = {
-    glob: eggBornMglob,
+exports.glob = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const semver_1 = __importDefault(require("semver"));
+const chalk_1 = __importDefault(require("chalk"));
+const boxen_1 = __importDefault(require("boxen"));
+const egg_born_utils_1 = __importDefault(require("egg-born-utils"));
+const meta_js_1 = require("./meta.js");
+const module_info_1 = require("@cabloy/module-info");
+__exportStar(require("./interface.js"), exports);
+const boxenOptions = {
+    padding: 1,
+    margin: 1,
+    align: 'center',
+    borderColor: 'yellow',
+    borderStyle: 'round',
 };
-const __pathSuites = [
-    {
-        prefix: 'src/suite/',
-        vendor: false,
-    },
-    {
-        prefix: 'src/suite-vendor/',
-        vendor: true,
-    },
-];
-const __pathsModules = [
-    {
-        prefix: 'src/module/',
-        vendor: false,
-        public: false,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
-        backends: [
-            { js: 'backend/src/main.js', static: 'backend/static' },
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-        ],
-    },
-    {
-        prefix: 'src/module-system/',
-        vendor: false,
-        public: false,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
-        backends: [
-            { js: 'backend/src/main.js', static: 'backend/static' },
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-        ],
-    },
-    {
-        prefix: 'src/suite/*/modules/',
-        vendor: false,
-        public: false,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
-        backends: [
-            { js: 'backend/src/main.js', static: 'backend/static' },
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-        ],
-    },
-    {
-        prefix: 'src/module-vendor/',
-        vendor: true,
-        public: false,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
-        backends: [
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-            { js: 'backend/src/main.js', static: 'backend/static' },
-        ],
-    },
-    {
-        prefix: 'src/suite-vendor/*/modules/',
-        vendor: true,
-        public: false,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
-        backends: [
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-            { js: 'backend/src/main.js', static: 'backend/static' },
-        ],
-    },
-    {
-        prefix: 'node_modules/egg-born-module-',
-        vendor: true,
-        public: true,
-        node_modules: true,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
-        backends: [
-            { js: 'dist/backend.js', static: 'dist/staticBackend' },
-            { js: 'backend/src/main.js', static: 'backend/static' },
-        ],
-    },
-];
 // type: front/backend/all
-function eggBornMglob(options) {
-    const { projectPath, disabledModules, disabledSuites, log, type } = options;
+async function glob(options) {
+    const { projectPath, disabledModules, disabledSuites, log, type, loadPackage } = options;
     // context
     const context = {
         options,
@@ -105,16 +55,28 @@ function eggBornMglob(options) {
         disabledModules: __getDisabledModules(disabledModules),
         disabledSuites: __getDisabledSuites(disabledSuites),
     };
+    // cabloy config
+    const cabloyConfig = await __loadCabloyConfig();
     // parse suites
     const suites = __parseSuites(projectPath);
     // parse modules
-    const modules = __parseModules(projectPath, type);
+    const modules = __parseModules(projectPath, cabloyConfig);
+    // load package
+    if (loadPackage !== false) {
+        await __loadPackage(suites);
+        await __loadPackage(modules);
+    }
     // bind suites modules
     __bindSuitesModules(suites, modules);
     // check suites
     __checkSuites(context, suites);
     // order
-    __orderModules(context, modules);
+    if (type === 'backend' && loadPackage !== false) {
+        __orderModules(context, modules);
+    }
+    else {
+        context.modules = modules;
+    }
     // log
     __logModules(context, log);
     __logSuites(context, log);
@@ -132,6 +94,21 @@ function eggBornMglob(options) {
         suitesVendor: context.suitesVendor,
     };
 }
+exports.glob = glob;
+async function __loadPackage(modules) {
+    const promises = [];
+    const modulesArray = [];
+    for (const moduleName in modules) {
+        const module = modules[moduleName];
+        promises.push(fs_extra_1.default.readFile(module.pkg));
+        modulesArray.push(moduleName);
+    }
+    const modulesPackage = await Promise.all(promises);
+    for (let i = 0; i < modulesPackage.length; i++) {
+        const moduleName = modulesArray[i];
+        modules[moduleName].package = JSON.parse(modulesPackage[i].toString());
+    }
+}
 function __orderModules(context, modules) {
     // 'a-version' first
     __pushModule(context, modules, 'a-version');
@@ -180,16 +157,16 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
     for (const key in dependencies) {
         const subModule = modules[key];
         if (!subModule) {
-            const message = chalk.keyword('orange')(`module ${moduleRelativeName} disabled`) +
+            const message = chalk_1.default.keyword('orange')(`module ${moduleRelativeName} disabled`) +
                 ', because ' +
-                chalk.keyword('cyan')(`module ${key} not exists`);
-            console.log('\n' + boxen(message, boxenOptions) + '\n');
+                chalk_1.default.keyword('cyan')(`module ${key} not exists`);
+            console.log('\n' + (0, boxen_1.default)(message, boxenOptions) + '\n');
             enabled = false; // process.exit(0);
             continue;
         }
         const subModuleVersion = dependencies[key];
-        if (semver.lt(subModule.package.version, subModuleVersion)) {
-            console.warn(chalk.cyan(`module ${key} is old`));
+        if (semver_1.default.lt(subModule.package.version, subModuleVersion)) {
+            console.warn(chalk_1.default.cyan(`module ${key} is old`));
             process.exit(0);
         }
         if (!__pushModule(context, modules, key)) {
@@ -198,98 +175,52 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
     }
     return enabled;
 }
-function __parseModules(projectPath, type) {
+function __parseModules(projectPath, cabloyConfig) {
+    const entities = cabloyConfig.source?.entities;
     const modules = {};
-    for (const __path of __pathsModules) {
+    for (const __path of meta_js_1.__pathsModules) {
         const prefix = `${projectPath}/${__path.prefix}`;
-        const filePkgs = eggBornUtils.tools.globbySync(`${prefix}*/package.json`);
-        for (let filePkg of filePkgs) {
+        const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
+        for (const filePkg of filePkgs) {
             // name
-            let name = filePkg.split('/').slice(-2)[0];
+            const name = filePkg.split('/').slice(-2)[0];
             // check if '-' prefix exists
             if (name.substring(0, 1) === '-') {
                 // skip
                 continue;
             }
-            // check if full name
-            if (!__path.public && name.indexOf('egg-born-module-') > -1) {
-                const pathSrc = path.join(prefix, name);
-                name = name.substring('egg-born-module-'.length);
-                filePkg = path.join(prefix, name, 'package.json');
-                const pathDest = path.join(prefix, name);
-                fse.moveSync(pathSrc, pathDest);
-                // throw new Error(`Should use relative name for local module: ${name}`);
-            }
             // info
-            const info = mparse.parseInfo(name, 'module');
+            const info = (0, module_info_1.parseInfo)(name, 'module');
             if (!info) {
                 throw new Error(`module name is not valid: ${name}`);
             }
+            // check if exists
+            if (modules[info.relativeName])
+                continue;
+            // info
             info.vendor = __path.vendor;
-            info.public = __path.public;
+            info.source = __path.source;
             info.node_modules = __path.node_modules;
-            // check if exists
-            if (!modules[info.relativeName]) {
-                // meta
-                const _package = require(filePkg);
-                const root = path.dirname(filePkg);
-                const moduleMeta = {
-                    name,
-                    info,
-                    root,
-                    pkg: filePkg,
-                    package: _package,
-                    js: {},
-                    static: {},
-                };
-                const _moduleMeta = __parseModule(__path, moduleMeta, type);
-                if (_moduleMeta) {
-                    // enhance check public
-                    // if (_moduleMeta.info.public) {
-                    const file = _moduleMeta.js.front || _moduleMeta.js.backend;
-                    _moduleMeta.info.public = file.replace(/\\/g, '/').indexOf('/dist/') > -1;
-                    // }
-                    // record
-                    modules[info.relativeName] = _moduleMeta;
-                }
+            info.originalName = name;
+            // source
+            const entity = entities?.[info.relativeName];
+            if (entity === true || entity === false) {
+                info.source = entity;
             }
+            // resource
+            const root = path_1.default.dirname(filePkg);
+            const module = {
+                name,
+                info,
+                root,
+                pkg: filePkg,
+            };
+            // record
+            modules[info.relativeName] = module;
         }
     }
     return modules;
 }
-function __parseModule(__path, moduleMeta, type) {
-    const root = moduleMeta.root;
-    // front
-    if (type !== 'backend') {
-        for (const item of __path.fronts) {
-            const file = path.join(root, item.js);
-            if (fse.existsSync(file)) {
-                moduleMeta.js.front = file;
-                break;
-            }
-        }
-        if (!moduleMeta.js.front) {
-            return null;
-        }
-    }
-    // backend
-    if (type !== 'front') {
-        for (const item of __path.backends) {
-            const file = path.join(root, item.js);
-            if (fse.existsSync(file)) {
-                moduleMeta.js.backend = file;
-                const staticBackendPath = path.normalize(path.join(root, item.static));
-                moduleMeta.static.backend = staticBackendPath;
-                break;
-            }
-        }
-        if (!moduleMeta.js.backend) {
-            return null;
-        }
-    }
-    // ok
-    return moduleMeta;
-}
 function __logModules(context, log) {
     for (const module of context.modulesArray) {
         const relativeName = module.info.relativeName;
@@ -306,19 +237,19 @@ function __logModules(context, log) {
     if (!log)
         return;
     // log
-    console.log(chalk.yellow('\n=== Local Modules ==='));
+    console.log(chalk_1.default.yellow('\n=== Local Modules ==='));
     for (const key in context.modulesLocal) {
-        console.log(chalk.cyan('> ' + key));
+        console.log(chalk_1.default.cyan('> ' + key));
     }
-    console.log(chalk.yellow('\n=== Global Modules ==='));
+    console.log(chalk_1.default.yellow('\n=== Global Modules ==='));
     for (const key in context.modulesGlobal) {
-        console.log(chalk.cyan('> ' + key));
+        console.log(chalk_1.default.cyan('> ' + key));
     }
-    console.log(chalk.yellow('\n=== Monkey Modules ==='));
+    console.log(chalk_1.default.yellow('\n=== Monkey Modules ==='));
     for (const key in context.modulesMonkey) {
-        console.log(chalk.cyan('> ' + key));
+        console.log(chalk_1.default.cyan('> ' + key));
     }
-    console.log(chalk.keyword('orange')(`\n=== Total Modules: ${context.modulesArray.length} ===`));
+    console.log(chalk_1.default.keyword('orange')(`\n=== Total Modules: ${context.modulesArray.length} ===`));
     // console.log('\n');
 }
 function __logSuites(context, log) {
@@ -334,15 +265,15 @@ function __logSuites(context, log) {
     if (!log)
         return;
     // log
-    console.log(chalk.yellow('\n=== Local Suites ==='));
+    console.log(chalk_1.default.yellow('\n=== Local Suites ==='));
     for (const key in context.suitesLocal) {
-        console.log(chalk.cyan('> ' + key));
+        console.log(chalk_1.default.cyan('> ' + key));
     }
-    console.log(chalk.yellow('\n=== Vendor Suites ==='));
+    console.log(chalk_1.default.yellow('\n=== Vendor Suites ==='));
     for (const key in context.suitesVendor) {
-        console.log(chalk.cyan('> ' + key));
+        console.log(chalk_1.default.cyan('> ' + key));
     }
-    console.log(chalk.keyword('orange')(`\n=== Total Suites: ${Object.keys(context.suites).length} ===`));
+    console.log(chalk_1.default.keyword('orange')(`\n=== Total Suites: ${Object.keys(context.suites).length} ===`));
     console.log('\n');
 }
 function __getDisabledModules(disabledModules) {
@@ -365,46 +296,40 @@ function __getDisabledSuites(disabledSuites) {
 }
 function __parseSuites(projectPath) {
     const suites = {};
-    for (const __path of __pathSuites) {
+    for (const __path of meta_js_1.__pathSuites) {
         const prefix = `${projectPath}/${__path.prefix}`;
-        const filePkgs = eggBornUtils.tools.globbySync(`${prefix}*/package.json`);
-        for (let filePkg of filePkgs) {
+        const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
+        for (const filePkg of filePkgs) {
             // name
-            let name = filePkg.split('/').slice(-2)[0];
+            const name = filePkg.split('/').slice(-2)[0];
             // check if '-' prefix exists
             if (name.substring(0, 1) === '-') {
                 // skip
                 continue;
             }
-            // check if full name
-            if (name.indexOf('egg-born-suite-') > -1) {
-                const pathSrc = path.join(prefix, name);
-                name = name.substring('egg-born-suite-'.length);
-                filePkg = path.join(prefix, name, 'package.json');
-                const pathDest = path.join(prefix, name);
-                fse.moveSync(pathSrc, pathDest);
-                // throw new Error(`Should use relative name for local suite: ${name}`);
-            }
             // info
-            const info = mparse.parseInfo(name, 'suite');
+            const info = (0, module_info_1.parseInfo)(name, 'suite');
             if (!info) {
                 throw new Error(`suite name is not valid: ${name}`);
             }
-            info.vendor = __path.vendor;
             // check if exists
-            if (!suites[info.relativeName]) {
-                // meta
-                const _package = require(filePkg);
-                const root = path.dirname(filePkg);
-                suites[info.relativeName] = {
-                    name,
-                    info,
-                    root,
-                    pkg: filePkg,
-                    package: _package,
-                    modules: [],
-                };
-            }
+            if (suites[info.relativeName])
+                continue;
+            // info
+            info.vendor = __path.vendor;
+            info.node_modules = __path.node_modules;
+            info.originalName = name;
+            // suite
+            const root = path_1.default.dirname(filePkg);
+            const suite = {
+                name,
+                info,
+                root,
+                pkg: filePkg,
+                modules: [],
+            };
+            // record
+            suites[info.relativeName] = suite;
         }
     }
     // ok
@@ -451,4 +376,9 @@ function __checkSuites(context, suites) {
         }
     }
 }
+async function __loadCabloyConfig() {
+    const __cabloyConfig = egg_born_utils_1.default.cabloyConfig;
+    const { config } = await __cabloyConfig.load();
+    return config;
+}
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -0,0 +1,24 @@
+import { IModule, ISuite } from '@cabloy/module-info';
+export interface IModuleGlobOptions {
+    projectPath: string;
+    disabledModules?: string[];
+    disabledSuites?: string[];
+    log?: boolean;
+    type: 'front' | 'backend';
+    loadPackage?: boolean;
+}
+export interface IModuleGlobContext {
+    options: IModuleGlobOptions;
+    suites: Record<string, ISuite>;
+    modules: Record<string, IModule>;
+    modulesArray: IModule[];
+    modulesLast: IModule[];
+    modulesLocal: Record<string, IModule>;
+    modulesGlobal: Record<string, IModule>;
+    modulesMonkey: Record<string, IModule>;
+    suitesLocal: Record<string, ISuite>;
+    suitesVendor: Record<string, ISuite>;
+    disabledModules: Record<string, boolean>;
+    disabledSuites: Record<string, boolean>;
+}
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/dist/meta.d.ts

@@ -0,0 +1,27 @@
+export declare const __pathSuites: ({
+    prefix: string;
+    vendor: boolean;
+    node_modules?: undefined;
+} | {
+    prefix: string;
+    vendor: boolean;
+    node_modules: boolean;
+})[];
+export declare const __pathsModules: ({
+    prefix: string;
+    vendor: boolean;
+    source: boolean;
+    fronts: {
+        js: string;
+    }[];
+    node_modules?: undefined;
+} | {
+    prefix: string;
+    vendor: boolean;
+    source: boolean;
+    node_modules: boolean;
+    fronts: {
+        js: string;
+    }[];
+})[];
+//# sourceMappingURL=meta.d.ts.map

package/dist/meta.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__pathsModules = exports.__pathSuites = void 0;
+exports.__pathSuites = [
+    {
+        prefix: 'src/suite/',
+        vendor: false,
+    },
+    {
+        prefix: 'src/suite-vendor/',
+        vendor: true,
+    },
+    {
+        prefix: 'node_modules/cabloy-suite-api-',
+        vendor: true,
+        node_modules: true,
+    },
+];
+exports.__pathsModules = [
+    {
+        prefix: 'src/module/',
+        vendor: false,
+        source: true,
+        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
+    },
+    {
+        prefix: 'src/module-system/',
+        vendor: false,
+        source: true,
+        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
+    },
+    {
+        prefix: 'src/suite/*/modules/',
+        vendor: false,
+        source: true,
+        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
+    },
+    {
+        prefix: 'src/module-vendor/',
+        vendor: true,
+        source: false,
+        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
+    },
+    {
+        prefix: 'src/suite-vendor/*/modules/',
+        vendor: true,
+        source: false,
+        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
+    },
+    {
+        prefix: 'node_modules/cabloy-module-api-',
+        vendor: true,
+        source: false,
+        node_modules: true,
+        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
+    },
+];
+//# sourceMappingURL=meta.js.map

package/package.json

@@ -1,12 +1,22 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "1.0.0",
+  "version": "5.0.0",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
+      "default": "./src/index.ts"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts"
@@ -21,6 +31,9 @@
     "cabloy"
   ],
   "author": "zhennann",
-  "license": "MIT",
-  "dependencies": {}
+  "dependencies": {
+    "@cabloy/module-info": "workspace:^",
+    "boxen": "^4.2.0",
+    "egg-born-utils": "^1.1.9"
+  }
 }