@cabloy/module-glob 5.0.3 → 5.0.5

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.d.ts

@@ -5,10 +5,5 @@ export declare function glob(options: IModuleGlobOptions): Promise<{
     suites: Record<string, ISuite>;
     modules: Record<string, IModule>;
     modulesArray: IModule[];
-    modulesLocal: Record<string, IModule>;
-    modulesGlobal: Record<string, IModule>;
-    modulesMonkey: Record<string, IModule>;
-    suitesLocal: Record<string, ISuite>;
-    suitesVendor: Record<string, ISuite>;
 }>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -48,6 +48,8 @@ async function glob(options) {
         modulesLocal: {},
         modulesGlobal: {},
         modulesMonkey: {},
+        modulesSync: {},
+        modulesIcon: {},
         //
         suitesLocal: {},
         suitesVendor: {},
@@ -75,6 +77,10 @@ async function glob(options) {
         __orderModules(context, modules);
     }
     else {
+        for (const moduleName in modules) {
+            const module = modules[moduleName];
+            context.modulesArray.push(module);
+        }
         context.modules = modules;
     }
     // log
@@ -86,12 +92,12 @@ async function glob(options) {
         modules: context.modules,
         modulesArray: context.modulesArray,
         //
-        modulesLocal: context.modulesLocal,
-        modulesGlobal: context.modulesGlobal,
-        modulesMonkey: context.modulesMonkey,
+        // modulesLocal: context.modulesLocal,
+        // modulesGlobal: context.modulesGlobal,
+        // modulesMonkey: context.modulesMonkey,
         //
-        suitesLocal: context.suitesLocal,
-        suitesVendor: context.suitesVendor,
+        // suitesLocal: context.suitesLocal,
+        // suitesVendor: context.suitesVendor,
     };
 }
 exports.glob = glob;
@@ -106,7 +112,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 +153,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 +164,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) {
@@ -220,6 +234,12 @@ function __logModules(context, log) {
         if (module.info.monkey) {
             context.modulesMonkey[relativeName] = module;
         }
+        if (module.info.sync) {
+            context.modulesSync[relativeName] = module;
+        }
+        if (module.info.icon) {
+            context.modulesIcon[relativeName] = module;
+        }
         if (module.info.public) {
             context.modulesGlobal[relativeName] = module;
         }
@@ -242,6 +262,14 @@ function __logModules(context, log) {
     for (const key in context.modulesMonkey) {
         console.log(chalk_1.default.cyan('> ' + key));
     }
+    console.log(chalk_1.default.yellow('\n=== Sync Modules ==='));
+    for (const key in context.modulesSync) {
+        console.log(chalk_1.default.cyan('> ' + key));
+    }
+    console.log(chalk_1.default.yellow('\n=== Icon Modules ==='));
+    for (const key in context.modulesIcon) {
+        console.log(chalk_1.default.cyan('> ' + key));
+    }
     console.log(chalk_1.default.keyword('orange')(`\n=== Total Modules: ${context.modulesArray.length} ===`));
     // console.log('\n');
 }

package/dist/interface.d.ts

@@ -16,6 +16,8 @@ export interface IModuleGlobContext {
     modulesLocal: Record<string, IModule>;
     modulesGlobal: Record<string, IModule>;
     modulesMonkey: Record<string, IModule>;
+    modulesSync: Record<string, IModule>;
+    modulesIcon: Record<string, IModule>;
     suitesLocal: Record<string, ISuite>;
     suitesVendor: Record<string, ISuite>;
     disabledModules: Record<string, boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "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.9"
+    "@cabloy/module-info": "^1.0.12"
   },
   "scripts": {
     "lint": "eslint ."