@cabloy/module-glob 5.0.1 → 5.0.3

package/dist/index.js

@@ -34,9 +34,9 @@ const boxenOptions = {
     borderColor: 'yellow',
     borderStyle: 'round',
 };
-// type: front/backend/all
+// 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,
@@ -54,13 +54,13 @@ async function glob(options) {
         //
         disabledModules: __getDisabledModules(disabledModules),
         disabledSuites: __getDisabledSuites(disabledSuites),
+        //
+        pathsMeta: (0, meta_js_1.getPathsMeta)(projectMode),
     };
-    // cabloy config
-    const cabloyConfig = await __loadCabloyConfig();
     // parse suites
-    const suites = __parseSuites(projectPath);
+    const suites = __parseSuites(context, projectPath);
     // parse modules
-    const modules = __parseModules(projectPath, cabloyConfig);
+    const modules = __parseModules(context, projectPath);
     // load package
     if (loadPackage !== false) {
         await __loadPackage(suites);
@@ -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 {
@@ -175,10 +175,9 @@ function __orderDependencies(context, modules, module, moduleRelativeName) {
     }
     return enabled;
 }
-function __parseModules(projectPath, cabloyConfig) {
-    const entities = cabloyConfig.source?.entities;
+function __parseModules(context, projectPath) {
     const modules = {};
-    for (const __path of meta_js_1.__pathsModules) {
+    for (const __path of context.pathsMeta.modules) {
         const prefix = `${projectPath}/${__path.prefix}`;
         const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
         for (const filePkg of filePkgs) {
@@ -190,7 +189,7 @@ function __parseModules(projectPath, cabloyConfig) {
                 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}`);
             }
@@ -199,14 +198,8 @@ function __parseModules(projectPath, cabloyConfig) {
                 continue;
             // info
             info.vendor = __path.vendor;
-            info.source = __path.source;
             info.node_modules = __path.node_modules;
             info.originalName = name;
-            // source
-            const entity = entities?.[info.relativeName];
-            if (entity === true || entity === false) {
-                info.source = entity;
-            }
             // resource
             const root = path_1.default.dirname(filePkg);
             const module = {
@@ -294,9 +287,9 @@ function __getDisabledSuites(disabledSuites) {
     }
     return disabledSuitesMap;
 }
-function __parseSuites(projectPath) {
+function __parseSuites(context, projectPath) {
     const suites = {};
-    for (const __path of meta_js_1.__pathSuites) {
+    for (const __path of context.pathsMeta.suites) {
         const prefix = `${projectPath}/${__path.prefix}`;
         const filePkgs = egg_born_utils_1.default.tools.globbySync(`${prefix}*/package.json`);
         for (const filePkg of filePkgs) {
@@ -308,7 +301,7 @@ function __parseSuites(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}`);
             }
@@ -376,9 +369,4 @@ function __checkSuites(context, suites) {
         }
     }
 }
-async function __loadCabloyConfig() {
-    const __cabloyConfig = egg_born_utils_1.default.cabloyConfig;
-    const { config } = await __cabloyConfig.load();
-    return config;
-}
 //# sourceMappingURL=index.js.map

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 {
@@ -20,5 +20,15 @@ export interface IModuleGlobContext {
     suitesVendor: Record<string, ISuite>;
     disabledModules: Record<string, boolean>;
     disabledSuites: Record<string, boolean>;
+    pathsMeta: IModuleGlobPathsMeta;
+}
+export interface IModuleGlobPathMetaItem {
+    prefix: string;
+    vendor: boolean;
+    node_modules?: boolean;
+}
+export interface IModuleGlobPathsMeta {
+    suites: IModuleGlobPathMetaItem[];
+    modules: IModuleGlobPathMetaItem[];
 }
 //# sourceMappingURL=interface.d.ts.map

package/dist/meta.d.ts

@@ -1,27 +1,4 @@
-export declare const __pathSuites: ({
-    prefix: string;
-    vendor: boolean;
-    node_modules?: undefined;
-} | {
-    prefix: string;
-    vendor: boolean;
-    node_modules: boolean;
-})[];
-export declare const __pathsModules: ({
-    prefix: string;
-    vendor: boolean;
-    source: boolean;
-    fronts: {
-        js: string;
-    }[];
-    node_modules?: undefined;
-} | {
-    prefix: string;
-    vendor: boolean;
-    source: boolean;
-    node_modules: boolean;
-    fronts: {
-        js: string;
-    }[];
-})[];
+import { TypeProjectMode } from '@cabloy/module-info';
+import { IModuleGlobPathsMeta } from './interface.js';
+export declare function getPathsMeta(projectMode: TypeProjectMode): IModuleGlobPathsMeta;
 //# sourceMappingURL=meta.d.ts.map

package/dist/meta.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__pathsModules = exports.__pathSuites = void 0;
-exports.__pathSuites = [
+exports.getPathsMeta = void 0;
+const __pathSuites = [
     {
         prefix: 'src/suite/',
         vendor: false,
@@ -10,49 +10,45 @@ exports.__pathSuites = [
         prefix: 'src/suite-vendor/',
         vendor: true,
     },
-    {
-        prefix: 'node_modules/cabloy-suite-api-',
-        vendor: true,
-        node_modules: true,
-    },
 ];
-exports.__pathsModules = [
+const __pathsModules = [
     {
         prefix: 'src/module/',
         vendor: false,
-        source: true,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
-    },
-    {
-        prefix: 'src/module-system/',
-        vendor: false,
-        source: true,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
     },
     {
         prefix: 'src/suite/*/modules/',
         vendor: false,
-        source: true,
-        fronts: [{ js: 'front/src/main.js' }, { js: 'dist/front.js' }],
     },
     {
         prefix: 'src/module-vendor/',
         vendor: true,
-        source: false,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
     },
     {
         prefix: 'src/suite-vendor/*/modules/',
         vendor: true,
-        source: false,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
-    },
-    {
-        prefix: 'node_modules/cabloy-module-api-',
-        vendor: true,
-        source: false,
-        node_modules: true,
-        fronts: [{ js: 'dist/front.js' }, { js: 'front/src/main.js' }],
     },
 ];
+function getPathsMeta(projectMode) {
+    const suites = __pathSuites.concat([
+        {
+            prefix: `node_modules/cabloy-suite-${projectMode}-`,
+            vendor: true,
+            node_modules: true,
+        },
+    ]);
+    const modules = __pathsModules.concat([
+        {
+            prefix: `node_modules/cabloy-module-${projectMode}-`,
+            vendor: true,
+            node_modules: true,
+        },
+    ]);
+    const pathsMeta = {
+        suites,
+        modules,
+    };
+    return pathsMeta;
+}
+exports.getPathsMeta = getPathsMeta;
 //# sourceMappingURL=meta.js.map

package/package.json

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