@cabloy/module-glob 5.1.11 → 5.2.0

package/dist/index.d.ts

@@ -1,9 +1,8 @@
-import { IModuleGlobOptions } from './interface.js';
-import { IModule, ISuite } from '@cabloy/module-info';
-export * from './interface.js';
+import type { IModule, ISuite } from '@cabloy/module-info';
+import type { IModuleGlobOptions } from './interface.ts';
+export * from './interface.ts';
 export declare function glob(options: IModuleGlobOptions): Promise<{
     suites: Record<string, ISuite>;
     modules: Record<string, IModule>;
     modulesArray: IModule[];
 }>;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,33 +1,13 @@
-"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 });
-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");
-const utils_1 = require("@cabloy/utils");
-__exportStar(require("./interface.js"), exports);
+import path from 'node:path';
+import { parseInfoPro, } from '@cabloy/module-info';
+import { checkMeta } from '@cabloy/utils';
+import boxen from 'boxen';
+import chalk from 'chalk';
+import fse from 'fs-extra';
+import { globbySync } from 'globby';
+import semver from 'semver';
+import { getPathsMeta } from "./meta.js";
+export * from "./interface.js";
 const SymbolModuleOrdering = Symbol('SymbolModuleOrdering');
 const boxenOptions = {
     padding: 1,
@@ -37,7 +17,7 @@ const boxenOptions = {
     borderStyle: 'round',
 };
 // type: front/backend
-async function glob(options) {
+export async function glob(options) {
     const { projectPath, disabledModules, disabledSuites, log, projectMode, meta } = options;
     // context
     const context = {
@@ -60,7 +40,7 @@ async function glob(options) {
         disabledSuites: __getDisabledSuites(disabledSuites),
         meta,
         //
-        pathsMeta: (0, meta_js_1.getPathsMeta)(projectMode),
+        pathsMeta: getPathsMeta(projectMode),
     };
     // parse suites
     const suites = __parseSuites(context, projectPath);
@@ -92,7 +72,6 @@ async function glob(options) {
         // suitesVendor: context.suitesVendor,
     };
 }
-exports.glob = glob;
 function getPackageModuleNode(projectMode) {
     return ['zova', 'vona'].includes(projectMode) ? `${projectMode}Module` : 'cabloyModule';
 }
@@ -101,7 +80,7 @@ async function __loadPackage(context, modules) {
     const modulesArray = [];
     for (const moduleName in modules) {
         const module = modules[moduleName];
-        promises.push(fs_extra_1.default.readFile(module.pkg));
+        promises.push(fse.readFile(module.pkg));
         modulesArray.push(moduleName);
     }
     const modulesPackage = await Promise.all(promises);
@@ -112,6 +91,11 @@ async function __loadPackage(context, modules) {
         const moduleNode = getPackageModuleNode(context.options.projectMode);
         const capabilities = module.package[moduleNode]?.capabilities;
         module.info.capabilities = capabilities;
+        module.info.onionsMeta = {
+            onions: module.package[moduleNode]?.onions,
+            metas: module.package[moduleNode]?.metas,
+            onionsConfig: module.package[moduleNode]?.onionsConfig,
+        };
     }
 }
 function __orderModules(context, modules) {
@@ -138,7 +122,7 @@ function __pushModule(context, modules, moduleRelativeName) {
         return false;
     // check meta
     const capabilities = module.package.zovaModule?.capabilities ?? module.package.vonaModule?.capabilities;
-    if (context.meta && capabilities && !(0, utils_1.checkMeta)(capabilities.meta, context.meta))
+    if (context.meta && capabilities && !checkMeta(capabilities.meta, context.meta))
         return false;
     // ordering
     if (module[SymbolModuleOrdering])
@@ -171,16 +155,14 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
     for (const key in dependencies) {
         const subModule = modules[key];
         if (!subModule) {
-            const message = chalk_1.default.keyword('orange')(`module ${moduleRelativeName} disabled`) +
-                ', because ' +
-                chalk_1.default.keyword('cyan')(`module ${key} not exists`);
-            console.log('\n' + (0, boxen_1.default)(message, boxenOptions) + '\n');
+            const message = `${chalk.keyword('orange')(`module ${moduleRelativeName} disabled`)}, because ${chalk.keyword('cyan')(`module ${key} not exists`)}`;
+            console.log(`\n${boxen(message, boxenOptions)}\n`);
             enabled = false; // process.exit(0);
             continue;
         }
         const subModuleVersion = dependencies[key];
-        if (semver_1.default.lt(subModule.package.version, subModuleVersion)) {
-            console.warn(chalk_1.default.cyan(`module ${key} is old`));
+        if (semver.lt(subModule.package.version, subModuleVersion)) {
+            console.warn(chalk.cyan(`module ${key} is old`));
             process.exit(0);
         }
         if (!__pushModule(context, modules, key)) {
@@ -192,18 +174,18 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
 function __parseModules(context, projectPath) {
     const modules = {};
     for (const __path of context.pathsMeta.modules) {
-        const prefix = `${projectPath}/${__path.prefix}`;
-        const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
-        for (const filePkg of filePkgs) {
+        const fileNames = globbySync(`${__path.prefix}*/package.json`, { cwd: projectPath });
+        for (const fileName of fileNames) {
+            const filePkg = path.join(projectPath, fileName);
             // name
-            const name = filePkg.split('/').slice(-2)[0];
+            const name = fileName.split('/').slice(-2)[0];
             // check if '-' prefix exists
             if (name.substring(0, 1) === '-') {
                 // skip
                 continue;
             }
             // info
-            const info = (0, module_info_1.parseInfoPro)(name, context.options.projectMode, 'module');
+            const info = parseInfoPro(name, context.options.projectMode, 'module');
             if (!info) {
                 throw new Error(`module name is not valid: ${name}`);
             }
@@ -215,7 +197,7 @@ function __parseModules(context, projectPath) {
             info.node_modules = __path.node_modules;
             info.originalName = name;
             // resource
-            const root = path_1.default.dirname(filePkg);
+            const root = path.dirname(filePkg);
             const module = {
                 name,
                 info,
@@ -250,27 +232,27 @@ function __logModules(context, log) {
     if (!log)
         return;
     // log
-    console.log(chalk_1.default.yellow('\n=== Local Modules ==='));
+    console.log(chalk.yellow('\n=== Local Modules ==='));
     for (const key in context.modulesLocal) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.yellow('\n=== Global Modules ==='));
+    console.log(chalk.yellow('\n=== Global Modules ==='));
     for (const key in context.modulesGlobal) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.yellow('\n=== Monkey Modules ==='));
+    console.log(chalk.yellow('\n=== Monkey Modules ==='));
     for (const key in context.modulesMonkey) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.yellow('\n=== Sync Modules ==='));
+    console.log(chalk.yellow('\n=== Sync Modules ==='));
     for (const key in context.modulesSync) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.yellow('\n=== Icon Modules ==='));
+    console.log(chalk.yellow('\n=== Icon Modules ==='));
     for (const key in context.modulesIcon) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.keyword('orange')(`\n=== Total Modules: ${context.modulesArray.length} ===`));
+    console.log(chalk.keyword('orange')(`\n=== Total Modules: ${context.modulesArray.length} ===`));
     // console.log('\n');
 }
 function __logSuites(context, log) {
@@ -286,15 +268,15 @@ function __logSuites(context, log) {
     if (!log)
         return;
     // log
-    console.log(chalk_1.default.yellow('\n=== Local Suites ==='));
+    console.log(chalk.yellow('\n=== Local Suites ==='));
     for (const key in context.suitesLocal) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.yellow('\n=== Vendor Suites ==='));
+    console.log(chalk.yellow('\n=== Vendor Suites ==='));
     for (const key in context.suitesVendor) {
-        console.log(chalk_1.default.cyan('> ' + key));
+        console.log(chalk.cyan(`> ${key}`));
     }
-    console.log(chalk_1.default.keyword('orange')(`\n=== Total Suites: ${Object.keys(context.suites).length} ===`));
+    console.log(chalk.keyword('orange')(`\n=== Total Suites: ${Object.keys(context.suites).length} ===`));
     console.log('\n');
 }
 function __getDisabledModules(disabledModules) {
@@ -322,18 +304,18 @@ function __getDisabledSuites(disabledSuites) {
 function __parseSuites(context, projectPath) {
     const suites = {};
     for (const __path of context.pathsMeta.suites) {
-        const prefix = `${projectPath}/${__path.prefix}`;
-        const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
-        for (const filePkg of filePkgs) {
+        const fileNames = globbySync(`${__path.prefix}*/package.json`, { cwd: projectPath });
+        for (const fileName of fileNames) {
+            const filePkg = path.join(projectPath, fileName);
             // name
-            const name = filePkg.split('/').slice(-2)[0];
+            const name = fileName.split('/').slice(-2)[0];
             // check if '-' prefix exists
             if (name.substring(0, 1) === '-') {
                 // skip
                 continue;
             }
             // info
-            const info = (0, module_info_1.parseInfoPro)(name, context.options.projectMode, 'suite');
+            const info = parseInfoPro(name, context.options.projectMode, 'suite');
             if (!info) {
                 throw new Error(`suite name is not valid: ${name}`);
             }
@@ -345,7 +327,7 @@ function __parseSuites(context, projectPath) {
             info.node_modules = __path.node_modules;
             info.originalName = name;
             // suite
-            const root = path_1.default.dirname(filePkg);
+            const root = path.dirname(filePkg);
             const suite = {
                 name,
                 info,
@@ -360,8 +342,8 @@ function __parseSuites(context, projectPath) {
     // ok
     return suites;
 }
-const __suite_pattern1 = /src\/suite\/([^\/]+)\/modules/;
-const __suite_pattern2 = /src\/suite-vendor\/([^\/]+)\/modules/;
+const __suite_pattern1 = /src\/suite\/([^/]+)\/modules/;
+const __suite_pattern2 = /src\/suite-vendor\/([^/]+)\/modules/;
 function __bindSuitesModules(suites, modules) {
     for (const moduleName in modules) {
         const module = modules[moduleName];
@@ -409,9 +391,8 @@ function _checkSuiteValid(context, suites, suiteRelativeName) {
         return false;
     // check meta
     const capabilities = suite.package.zovaModule?.capabilities ?? suite.package.vonaModule?.capabilities;
-    if (context.meta && capabilities && !(0, utils_1.checkMeta)(capabilities.meta, context.meta))
+    if (context.meta && capabilities && !checkMeta(capabilities.meta, context.meta))
         return false;
     // ok
     return true;
 }
-//# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,4 +1,4 @@
-import { IModule, ISuite, TypeProjectMode } from '@cabloy/module-info';
+import type { IModule, ISuite, TypeProjectMode } from '@cabloy/module-info';
 export interface IModuleGlobOptions {
     projectMode: TypeProjectMode;
     projectPath: string;
@@ -35,4 +35,3 @@ export interface IModuleGlobPathsMeta {
     suites: IModuleGlobPathMetaItem[];
     modules: IModuleGlobPathMetaItem[];
 }
-//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

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

package/dist/meta.d.ts

@@ -1,4 +1,3 @@
-import { TypeProjectMode } from '@cabloy/module-info';
-import { IModuleGlobPathsMeta } from './interface.js';
+import type { TypeProjectMode } from '@cabloy/module-info';
+import type { IModuleGlobPathsMeta } from './interface.ts';
 export declare function getPathsMeta(projectMode: TypeProjectMode): IModuleGlobPathsMeta;
-//# sourceMappingURL=meta.d.ts.map

package/dist/meta.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPathsMeta = void 0;
 const __pathSuites = [
     {
         prefix: 'src/suite/',
@@ -29,7 +26,7 @@ const __pathsModules = [
         vendor: true,
     },
 ];
-function getPathsMeta(projectMode) {
+export function getPathsMeta(projectMode) {
     let brand;
     let mode;
     if (['zova', 'vona'].includes(projectMode)) {
@@ -60,5 +57,3 @@ function getPathsMeta(projectMode) {
     };
     return pathsMeta;
 }
-exports.getPathsMeta = getPathsMeta;
-//# sourceMappingURL=meta.js.map

package/package.json

@@ -1,42 +1,36 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.1.11",
+  "type": "module",
+  "version": "5.2.0",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"
   },
+  "author": "zhennann",
+  "keywords": [
+    "framework",
+    "cabloy"
+  ],
   "exports": {
     ".": {
       "types": [
         "./src/index.ts",
         "./dist/index.d.ts"
       ],
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist"
   ],
-  "keywords": [
-    "egg",
-    "egg-born",
-    "framework",
-    "cabloy"
-  ],
-  "author": "zhennann",
   "dependencies": {
     "boxen": "^4.2.0",
     "chalk": "^3.0.0",
-    "egg-born-utils": "^1.2.0",
-    "@cabloy/module-info": "^1.2.5",
-    "@cabloy/utils": "^1.0.2"
-  },
-  "gitHead": "2d40c063c115b230fdbc89f5a78b4412ebd0dfc9",
-  "scripts": {
-    "lint": "eslint ."
+    "fs-extra": "^11.3.0",
+    "globby": "^14.1.0",
+    "semver": "^7.7.1",
+    "@cabloy/module-info": "^1.3.1",
+    "@cabloy/utils": "^1.0.3"
   }
 }