优化插件注册逻辑，支持模块导入，更新对象注册和贡献处理；修复默认路由和类型映射

hotlong · hotlong · commit fcb1370c43fa · 2026-01-20T23:07:42.000+08:00
diff --git a/examples/objectql/src/engine.ts b/examples/objectql/src/engine.ts
@@ -33,20 +33,34 @@ export class ObjectQL {
   async use(manifestPart: any, runtimePart?: any) {
     // 1. Validate / Register Manifest
     if (manifestPart) {
+      // 1. Handle Module Imports (commonjs/esm interop)
+      // If the passed object is a module namespace with a default export, use that.
+      const manifest = manifestPart.default || manifestPart;
+
       // In a real scenario, we might strictly parse this using Zod
       // For now, simple ID check
-      const id = manifestPart.id;
+      const id = manifest.id || manifest.name;
       if (!id) {
-        console.warn('[ObjectQL] Plugin manifest missing ID', manifestPart);
-        return;
+        console.warn(`[ObjectQL] Plugin manifest missing ID (keys: ${Object.keys(manifest)})`, manifest);
+        // Don't return, try to proceed if it looks like an App (Apps might use 'name' instead of 'id')
+        // return; 
       }
       
       console.log(`[ObjectQL] Loading Plugin: ${id}`);
-      SchemaRegistry.registerPlugin(manifestPart as ObjectStackManifest);
+      SchemaRegistry.registerPlugin(manifest as ObjectStackManifest);
+
+      // Register Objects from App/Plugin
+      if (manifest.objects) {
+        for (const obj of manifest.objects) {
+            // Ensure object name is registered globally
+            SchemaRegistry.registerObject(obj);
+            console.log(`[ObjectQL] Registered Object: ${obj.name}`);
+        }
+      }
 
       // Register contributions
-       if (manifestPart.contributes?.kinds) {
-          for (const kind of manifestPart.contributes.kinds) {
+       if (manifest.contributes?.kinds) {
+          for (const kind of manifest.contributes.kinds) {
             SchemaRegistry.registerKind(kind);
           }
        }
diff --git a/examples/server/public/index.html b/examples/server/public/index.html
@@ -13,6 +13,8 @@
         .badge { padding: 4px 8px; border-radius: 12px; font-size: 12px; }
         .badge-done { background: #e3fcef; color: #0d7f56; }
         .badge-todo { background: #fff8c5; color: #9a6700; }
+        .badge-true { background: #e3fcef; color: #0d7f56; }
+        .badge-false { background: #fff8c5; color: #9a6700; }
     </style>
 </head>
 <body>
@@ -83,9 +85,13 @@
                         let cellContent = val;
                         
                         // 根据 Schema 类型或 View 组件进行特殊渲染
-                        if ((col.widget === 'badge' || fieldConfig.type === 'select') && val) {
+                        if ((col.widget === 'badge' || fieldConfig.type === 'select' || typeof val === 'boolean') && val !== undefined) {
                             const badgeClass = `badge-${String(val).toLowerCase()}`;
                             cellContent = `<span class="badge ${badgeClass}">${val}</span>`;
+                        } else if (fieldConfig.type === 'date' && val) {
+                             cellContent = new Date(val).toLocaleDateString();
+                        } else if (fieldConfig.type === 'rating') {
+                             cellContent = '★'.repeat(Number(val)) + '☆'.repeat(3 - Number(val));
                         }
                         
                         html += `<td>${cellContent}</td>`;
@@ -101,8 +107,8 @@
         // 启动应用
         const ui = new ObjectUIRenderer('app');
         // 'Todo' 是 TodoApp 里的对象名 (注意大小写，SchemaRegistry 也许是敏感的，取决于 TodoApp 定义)
-        // 假设 TodoApp 定义的是 'Todo'
-        ui.renderList('Todo'); 
+        // TodoApp 定义的是 'todo_task'
+        ui.renderList('todo_task'); 
 
     </script>
 </body>
diff --git a/examples/server/src/index.ts b/examples/server/src/index.ts
@@ -10,6 +10,13 @@ import { DataEngine } from './kernel/engine';
 const app = new Hono();
 const dataEngine = new DataEngine(); // Engine loads plugins internally now
 
+app.use('*', logger());
+app.use('*', cors());
+
+// Default Route: Serve Client Lite
+app.get('/', serveStatic({ root: './public', path: 'index.html' }));
+app.get('/index.html', serveStatic({ root: './public', path: 'index.html' }));
+
 // 3. Define Unified Routes
 
 /**
@@ -85,16 +92,16 @@ app.get('/api/v1/meta/:type/:name', (c) => {
   const typePlural = c.req.param('type');
   const name = c.req.param('name');
   
-  // const typeMap: Record<string, string> = {
-  //   'objects': 'object',
-  //   'apps': 'app',
-  //   'flows': 'flow',
-  //   'reports': 'report',
-  //   'plugins': 'plugin',
-  //   'kinds': 'kind'
-  // };
-  // const type = typeMap[typePlural] || typePlural;
-  const type = typePlural; // Direct pass-through
+  const typeMap: Record<string, string> = {
+    'objects': 'object',
+    'apps': 'app',
+    'flows': 'flow',
+    'reports': 'report',
+    'plugins': 'plugin',
+    'kinds': 'kind'
+  };
+  const type = typeMap[typePlural] || typePlural;
+  // const type = typePlural; // Direct pass-through
 
   const item = SchemaRegistry.getItem(type, name);
   if (!item) return c.json({ error: `Metadata not found: ${type}/${name}` }, 404);
