@cabloy/module-glob 5.0.2 → 5.0.4

package/LICENSE.en-US

@@ -0,0 +1,3 @@
+Copyright (c) 2016-present CabloyJS
+
+CabloyJS 5.0 internal beta version, still under continuous development, not yet open source, please do not spread it

package/LICENSE.zh-CN

@@ -0,0 +1,3 @@
+Copyright (c) 2016-present CabloyJS
+
+CabloyJS 5.0 内测版，仍在持续开发中，尚未开源，请勿扩散

package/dist/index.js

@@ -36,7 +36,7 @@ const boxenOptions = {
 };
 // type: front/backend
 async function glob(options) {
-    const { projectPath, disabledModules, disabledSuites, log, type, loadPackage } = options;
+    const { projectPath, disabledModules, disabledSuites, log, projectMode, loadPackage } = options;
     // context
     const context = {
         options,
@@ -55,7 +55,7 @@ async function glob(options) {
         disabledModules: __getDisabledModules(disabledModules),
         disabledSuites: __getDisabledSuites(disabledSuites),
         //
-        pathsMeta: (0, meta_js_1.getPathsMeta)(type),
+        pathsMeta: (0, meta_js_1.getPathsMeta)(projectMode),
     };
     // parse suites
     const suites = __parseSuites(context, projectPath);
@@ -71,7 +71,7 @@ async function glob(options) {
     // check suites
     __checkSuites(context, suites);
     // order
-    if (type === 'backend' && loadPackage !== false) {
+    if (projectMode === 'api' && loadPackage !== false) {
         __orderModules(context, modules);
     }
     else {
@@ -106,7 +106,15 @@ async function __loadPackage(modules) {
     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());
+        const module = modules[moduleName];
+        module.package = JSON.parse(modulesPackage[i].toString());
+        const capabilities = module.package.cabloyModule?.capabilities;
+        if (capabilities?.icon)
+            module.info.icon = capabilities?.icon;
+        if (capabilities?.monkey)
+            module.info.monkey = capabilities?.monkey;
+        if (capabilities?.sync)
+            module.info.sync = capabilities?.sync;
     }
 }
 function __orderModules(context, modules) {
@@ -139,7 +147,7 @@ function __pushModule(context, modules, moduleRelativeName) {
     }
     // push this
     context.modules[moduleRelativeName] = module;
-    if (module.package && module.package.eggBornModule && module.package.eggBornModule.last === true) {
+    if (module.package && module.package.cabloyModule && module.package.cabloyModule.last === true) {
         context.modulesLast.push(module);
     }
     else {
@@ -150,10 +158,10 @@ function __pushModule(context, modules, moduleRelativeName) {
 function __orderDependencies(context, modules, module, moduleRelativeName) {
     if (context.options.disableCheckDependencies)
         return true;
-    if (!module.package.eggBornModule || !module.package.eggBornModule.dependencies)
+    if (!module.package.cabloyModule || !module.package.cabloyModule.dependencies)
         return true;
     let enabled = true;
-    const dependencies = module.package.eggBornModule.dependencies;
+    const dependencies = module.package.cabloyModule.dependencies;
     for (const key in dependencies) {
         const subModule = modules[key];
         if (!subModule) {
@@ -189,7 +197,7 @@ function __parseModules(context, projectPath) {
                 continue;
             }
             // info
-            const info = (0, module_info_1.parseInfo)(name, 'module');
+            const info = (0, module_info_1.parseInfoPro)(name, context.options.projectMode, 'module');
             if (!info) {
                 throw new Error(`module name is not valid: ${name}`);
             }
@@ -301,7 +309,7 @@ function __parseSuites(context, projectPath) {
                 continue;
             }
             // info
-            const info = (0, module_info_1.parseInfo)(name, 'suite');
+            const info = (0, module_info_1.parseInfoPro)(name, context.options.projectMode, 'suite');
             if (!info) {
                 throw new Error(`suite name is not valid: ${name}`);
             }

package/dist/interface.d.ts

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

package/dist/meta.d.ts

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

package/dist/meta.js

@@ -29,17 +29,17 @@ const __pathsModules = [
         vendor: true,
     },
 ];
-function getPathsMeta(type) {
+function getPathsMeta(projectMode) {
     const suites = __pathSuites.concat([
         {
-            prefix: type === 'backend' ? 'node_modules/cabloy-suite-api-' : 'node_modules/cabloy-suite-front-',
+            prefix: `node_modules/cabloy-suite-${projectMode}-`,
             vendor: true,
             node_modules: true,
         },
     ]);
     const modules = __pathsModules.concat([
         {
-            prefix: type === 'backend' ? 'node_modules/cabloy-module-api-' : 'node_modules/cabloy-module-front-',
+            prefix: `node_modules/cabloy-module-${projectMode}-`,
             vendor: true,
             node_modules: true,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
   "dependencies": {
     "boxen": "^4.2.0",
     "egg-born-utils": "^1.1.9",
-    "@cabloy/module-info": "^1.0.7"
+    "@cabloy/module-info": "^1.0.12"
   },
   "scripts": {
     "lint": "eslint ."