@cabloy/module-glob 5.1.9 → 5.1.11

package/dist/index.js

@@ -26,7 +26,9 @@ 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);
+const SymbolModuleOrdering = Symbol('SymbolModuleOrdering');
 const boxenOptions = {
     padding: 1,
     margin: 1,
@@ -36,7 +38,7 @@ const boxenOptions = {
 };
 // type: front/backend
 async function glob(options) {
-    const { projectPath, disabledModules, disabledSuites, log, projectMode } = options;
+    const { projectPath, disabledModules, disabledSuites, log, projectMode, meta } = options;
     // context
     const context = {
         options,
@@ -56,6 +58,7 @@ async function glob(options) {
         //
         disabledModules: __getDisabledModules(disabledModules),
         disabledSuites: __getDisabledSuites(disabledSuites),
+        meta,
         //
         pathsMeta: (0, meta_js_1.getPathsMeta)(projectMode),
     };
@@ -128,14 +131,19 @@ function __orderModules(context, modules) {
     }
 }
 function __pushModule(context, modules, moduleRelativeName) {
+    // module
+    const module = modules[moduleRelativeName];
     // check if disable
     if (context.disabledModules[moduleRelativeName])
         return false;
-    // module
-    const module = modules[moduleRelativeName];
-    if (module.__ordering)
+    // check meta
+    const capabilities = module.package.zovaModule?.capabilities ?? module.package.vonaModule?.capabilities;
+    if (context.meta && capabilities && !(0, utils_1.checkMeta)(capabilities.meta, context.meta))
+        return false;
+    // ordering
+    if (module[SymbolModuleOrdering])
         return true;
-    module.__ordering = true;
+    module[SymbolModuleOrdering] = true;
     // dependencies
     if (!__orderDependencies(context, modules, module, moduleRelativeName)) {
         context.disabledModules[moduleRelativeName] = true;
@@ -382,7 +390,7 @@ function __checkSuites(context, suites) {
     for (const key in suites) {
         const suite = suites[key];
         // check if disable
-        if (!context.disabledSuites[key]) {
+        if (_checkSuiteValid(context, suites, key)) {
             context.suites[key] = suite;
         }
         else {
@@ -393,4 +401,17 @@ function __checkSuites(context, suites) {
         }
     }
 }
+function _checkSuiteValid(context, suites, suiteRelativeName) {
+    // suite
+    const suite = suites[suiteRelativeName];
+    // check if disable
+    if (context.disabledSuites[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))
+        return false;
+    // ok
+    return true;
+}
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -5,6 +5,8 @@ export interface IModuleGlobOptions {
     disabledModules?: string[] | string;
     disabledSuites?: string[] | string;
     log?: boolean;
+    meta?: {};
+    disableCheckDependencies?: boolean;
 }
 export interface IModuleGlobContext {
     options: IModuleGlobOptions;
@@ -21,6 +23,7 @@ export interface IModuleGlobContext {
     suitesVendor: Record<string, ISuite>;
     disabledModules: Record<string, boolean>;
     disabledSuites: Record<string, boolean>;
+    meta?: {};
     pathsMeta: IModuleGlobPathsMeta;
 }
 export interface IModuleGlobPathMetaItem {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.1.9",
+  "version": "5.1.11",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"
@@ -32,7 +32,8 @@
     "boxen": "^4.2.0",
     "chalk": "^3.0.0",
     "egg-born-utils": "^1.2.0",
-    "@cabloy/module-info": "^1.2.3"
+    "@cabloy/module-info": "^1.2.5",
+    "@cabloy/utils": "^1.0.2"
   },
   "gitHead": "2d40c063c115b230fdbc89f5a78b4412ebd0dfc9",
   "scripts": {