@cabloy/module-glob 5.0.5 → 5.0.7

package/dist/index.js

@@ -36,7 +36,7 @@ const boxenOptions = {
 };
 // type: front/backend
 async function glob(options) {
-    const { projectPath, disabledModules, disabledSuites, log, projectMode, loadPackage } = options;
+    const { projectPath, disabledModules, disabledSuites, log, projectMode } = options;
     // context
     const context = {
         options,
@@ -64,25 +64,14 @@ async function glob(options) {
     // parse modules
     const modules = __parseModules(context, projectPath);
     // load package
-    if (loadPackage !== false) {
-        await __loadPackage(suites);
-        await __loadPackage(modules);
-    }
+    await __loadPackage(suites);
+    await __loadPackage(modules);
     // bind suites modules
     __bindSuitesModules(suites, modules);
     // check suites
     __checkSuites(context, suites);
     // order
-    if (projectMode === 'api' && loadPackage !== false) {
-        __orderModules(context, modules);
-    }
-    else {
-        for (const moduleName in modules) {
-            const module = modules[moduleName];
-            context.modulesArray.push(module);
-        }
-        context.modules = modules;
-    }
+    __orderModules(context, modules);
     // log
     __logModules(context, log);
     __logSuites(context, log);
@@ -125,7 +114,9 @@ async function __loadPackage(modules) {
 }
 function __orderModules(context, modules) {
     // 'a-version' first
-    __pushModule(context, modules, 'a-version');
+    if (modules['a-version']) {
+        __pushModule(context, modules, 'a-version');
+    }
     // others
     for (const key in modules) {
         if (key !== 'a-version') {

package/dist/interface.d.ts

@@ -1,11 +1,10 @@
 import { IModule, ISuite, TypeProjectMode } from '@cabloy/module-info';
 export interface IModuleGlobOptions {
     projectPath: string;
+    projectMode: TypeProjectMode;
     disabledModules?: string[];
     disabledSuites?: string[];
     log?: boolean;
-    projectMode: TypeProjectMode;
-    loadPackage?: boolean;
 }
 export interface IModuleGlobContext {
     options: IModuleGlobOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"