@cabloy/module-glob 5.2.56 → 5.2.58

package/dist/index.js

@@ -1,10 +1,10 @@
-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 path from 'node:path';
 import semver from 'semver';
 
 const __pathSuites = [{
@@ -115,6 +115,9 @@ async function glob(options) {
   // order
   __orderModules(context, modules);
 
+  // check disables, after __orderModules
+  __checkModulesDisables(context);
+
   // log
   __logModules(context, log);
   __logSuites(context, log);
@@ -136,6 +139,21 @@ async function glob(options) {
 function getPackageModuleNode(projectMode) {
   return ['zova', 'vona'].includes(projectMode) ? `${projectMode}Module` : 'cabloyModule';
 }
+function __checkModulesDisables(context) {
+  for (const key of Object.keys(context.modules)) {
+    const module = context.modules[key];
+    if (!module) continue;
+    const disables = module.package.zovaModule?.disables ?? module.package.vonaModule?.disables;
+    if (!disables) continue;
+    for (const name of disables) {
+      delete context.modules[name];
+      const index = context.modulesArray.findIndex(item => item.info.relativeName === name);
+      if (index > -1) {
+        context.modulesArray.splice(index, 1);
+      }
+    }
+  }
+}
 async function __loadPackage(context, modules) {
   const promises = [];
   const modulesArray = [];
@@ -213,18 +231,20 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
   const dependencies = module.package[moduleNode].dependencies;
   for (const key in dependencies) {
     const subModule = modules[key];
-    if (!subModule) {
-      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.lt(subModule.package.version, subModuleVersion)) {
-      console.warn(chalk.cyan(`module ${key} is old`));
-      process.exit(0);
+    if (context.options.check !== false) {
+      if (!subModule) {
+        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.lt(subModule.package.version, subModuleVersion)) {
+        console.warn(chalk.cyan(`module ${key} is old`));
+        process.exit(0);
+      }
     }
-    if (!__pushModule(context, modules, key)) {
+    if (subModule && !__pushModule(context, modules, key)) {
       enabled = false;
     }
   }

package/dist/interface.d.ts

@@ -5,6 +5,7 @@ export interface IModuleGlobOptions {
     disabledModules?: string[] | string;
     disabledSuites?: string[] | string;
     log?: boolean;
+    check?: boolean;
     meta?: {};
     disableCheckDependencies?: boolean;
 }

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@cabloy/module-glob",
-  "type": "module",
-  "version": "5.2.56",
+  "version": "5.2.58",
+  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "description": "cabloy module-glob",
-  "publishConfig": {
-    "access": "public"
-  },
-  "author": "zhennann",
   "keywords": [
-    "framework",
-    "cabloy"
+    "cabloy",
+    "framework"
+  ],
+  "author": "zhennann",
+  "files": [
+    "dist"
   ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -21,11 +22,11 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
-    "@cabloy/module-info": "^1.3.41",
+    "@cabloy/module-info": "^2.0.0",
     "@cabloy/utils": "^2.0.24",
     "boxen": "^4.2.0",
     "chalk": "^3.0.0",
@@ -33,7 +34,6 @@
     "globby": "^16.0.0",
     "semver": "^7.7.1"
   },
-  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
     "clean": "rimraf dist tsconfig.tsbuildinfo",
     "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"