chanjs 2.0.4 → 2.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",

package/utils/dataparse.js

@@ -0,0 +1,24 @@
+/**
+ * 将数组转换为键值对对象
+ * @param {Array} arr - 包含键值对的数组
+ * @param {string} keyField - 作为键的字段名
+ * @param {string} valueField - 作为值的字段名
+ * @returns {Object} 转换后的对象
+ */
+export const arrToObj = (arr, keyField = 'config_key', valueField = 'config_value') => {
+    // 输入验证
+    if (!Array.isArray(arr)) {
+      throw new Error('arrToObj 期望接收数组作为第一个参数');
+    }
+    
+    return arr.reduce((result, item) => {
+      if (item && typeof item === 'object') {
+        const key = item[keyField];
+        const value = item[valueField];
+        if (key !== undefined && value !== undefined) {
+          result[key] = value;
+        }
+      }
+      return result;
+    }, {});
+  };

package/utils/loader.js

@@ -1,32 +1,32 @@
-import fs from 'fs';
-import path from 'path';
-import { bindClass } from './bind.js';
+import fs from "fs";
+import path from "path";
+import { bindClass } from "./bind.js";
 
 /**
- * 
+ *
  * @param {*} module 模块目录
- * @returns Array 
+ * @returns Array
  * @description 将web模块放到最后加载
  */
-export const loaderSort = (modules=[])=>{
-  const index = modules.indexOf('web');
+export const loaderSort = (modules = []) => {
+  const index = modules.indexOf("web");
   if (index !== -1) {
-      const web = modules.splice(index, 1);
-      modules.push(web[0]);
+    const web = modules.splice(index, 1);
+    modules.push(web[0]);
   }
   return modules;
-}
+};
 
-export const getPackage = async function(){
-  let pkg = await importFile('package.json')
+export const getPackage = async function () {
+  let pkg = await importFile("package.json");
   return pkg;
-}
+};
 
-export const loadConfig = async function(){
-  let config = await importFile('config/index.js')
+export const loadConfig = async function () {
+  let config = await importFile("config/index.js");
+  console.log("config", config);
   return config;
-}
-
+};
 
 /**
  * 加载指定模块名下的所有控制器文件
@@ -36,22 +36,24 @@ export const loadConfig = async function(){
 export const loadController = async function (moduleName) {
   const controller = {};
 
-  const dir = path.join(MODULES_PATH, moduleName,'controller');
+  const dir = path.join(MODULES_PATH, moduleName, "controller");
 
   if (!fs.existsSync(dir)) {
     console.warn(`模块路径不存在，跳过加载控制器: ${dir}`);
     return controller;
   }
 
-  const files = fs.readdirSync(dir).filter(file => file.endsWith('.js'));
+  const files = fs.readdirSync(dir).filter((file) => file.endsWith(".js"));
 
   for (const file of files) {
     const filePath = path.join(dir, file);
-    const name = file.replace(/\.js$/i, ''); // 安全处理 .js 后缀
+    const name = file.replace(/\.js$/i, ""); // 安全处理 .js 后缀
 
     try {
       const module = await importFile(filePath);
-      controller[name] = { ...module};
+      let obj = module.default || module;
+
+      controller[name] = obj;
     } catch (e) {
       console.error(`加载控制器失败: ${filePath}`, e);
       // 可选：抛出错误或继续加载其他文件
@@ -61,6 +63,3 @@ export const loadController = async function (moduleName) {
 
   return controller;
 };
-
-
-