优化 Schema 获取和同步功能，添加数据清理逻辑，更新 OpenAPI 规范

Author: hotlong

packages/api/src/index.ts

@@ -118,7 +118,13 @@ export function createObjectQLRouter(options: ObjectQLServerOptions): Router {
     router.get('/_schema', async (req: Request, res: Response) => {
         try {
             const configs = objectql.getConfigs();
-            res.json(configs);
+            // Clone and strip data
+            const sanitized = Object.entries(configs).reduce((acc, [key, val]) => {
+                const { data, ...rest } = val;
+                acc[key] = rest;
+                return acc;
+            }, {} as Record<string, any>);
+            res.json(sanitized);
         } catch (e: any) {
              res.status(500).json({ error: e.message });
         }
@@ -134,6 +140,18 @@ export function createObjectQLRouter(options: ObjectQLServerOptions): Router {
                 // assume item has id or name
                 const key = item.id || item.name || item.code;
                 if (key) {
+                    const content = { ...item };
+                    // If content has data (e.g. object config inside metadata), strip it
+                    if (content.data && Array.isArray(content.data) && type === 'object') {
+                        delete content.data;
+                    } 
+                    // Should we check item.content.data? Metadata wrapper vs content.
+                    // MetadataRegistry stores { content: ... }
+                    // list() returns `m.content`.
+                    // So item IS the object config.
+                    
+                    if ((item as any).data) delete (item as any).data;
+                    
                     result[key] = item;
                 }
             }
@@ -150,7 +168,19 @@ export function createObjectQLRouter(options: ObjectQLServerOptions): Router {
             if (!item) {
                 return res.status(404).json({ error: "Metadata not found" });
             }
-            res.json(item);
+            const copy = { ...item };
+            if ((copy as any).data) delete (copy as any).data;
+            res.json(copy);
+        } catch (e: any) {
+             res.status(500).json({ error: e.message });
+        }
+    });
+
+    router.post('/_schema/sync', async (req: Request, res: Response) => {
+        try {
+             // Re-run init to sync schema and data
+             await objectql.init();
+             res.json({ status: 'ok', message: 'Schema and data synced successfully' });
         } catch (e: any) {
              res.status(500).json({ error: e.message });
         }

packages/api/src/swagger/generator.ts

@@ -99,6 +99,29 @@ export function generateOpenApiSpec(objectql: IObjectQL) {
       }
   };
 
+  paths['/api/_schema/sync'] = {
+      post: {
+          summary: "Sync Schema & Data",
+          tags: ["System"],
+          responses: {
+              200: {
+                  description: "Sync result",
+                  content: {
+                      'application/json': {
+                          schema: {
+                              type: 'object',
+                              properties: {
+                                  status: { type: 'string' },
+                                  message: { type: 'string' }
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+      }
+  };
+
   Object.values(configs).forEach((config) => {
     const objectName = config.name;
     const schemaName = objectName;

packages/driver-knex/src/index.ts

@@ -265,6 +265,10 @@ export class KnexDriver implements Driver {
             console.log(`[KnexDriver] Database '${dbName}' created successfully.`);
         } catch (e: any) {
              console.error(`[KnexDriver] Failed to create database '${dbName}':`, e.message);
+             if (e.code === '42501') {
+                 console.error(`[KnexDriver] Hint: The user '${adminConfig.connection.user || 'current user'}' does not have CREATEDB privileges.`);
+                 console.error(`[KnexDriver] Please run: createdb ${dbName}`);
+             }
              throw e;
         } finally {
             await adminKnex.destroy();

packages/metadata/src/plugins/objectql.ts

@@ -142,31 +142,30 @@ export function registerObjectQLPlugins(loader: MetadataLoader) {
     });
 
     // Data
-    // loader.use({
-    //     name: 'data',
-    //     glob: ['**/*.data.yml', '**/*.data.yaml'],
-    //     handler: (ctx) => {
-    //         try {
-    //             const content = ctx.content;
-    //             const data = yaml.load(content);
-    //             if (!Array.isArray(data)) return;
+    loader.use({
+        name: 'data',
+        glob: ['**/*.data.yml', '**/*.data.yaml'],
+        handler: (ctx) => {
+            try {
+                const content = ctx.content;
+                const data = yaml.load(content);
+                if (!Array.isArray(data)) return;
 
-    //             const basename = path.basename(ctx.file);
-    //             const objectName = basename.replace(/\.data\.ya?ml$/, '');
+                const basename = path.basename(ctx.file);
+                const objectName = basename.replace(/\.data\.ya?ml$/, '');
 
-    //             const entry = ctx.registry.getEntry('object', objectName);
-    //             if (entry) {
-    //                 const config = entry.content as ObjectConfig;
-    //                 // We don't want to load data into metadata
-    //                 // config.data = data; 
-    //             } else {
-    //                 // console.warn(`Found data for unknown object '${objectName}' in ${ctx.file}`);
-    //             }
-    //         } catch (e) {
-    //             console.error(`Error loading data from ${ctx.file}:`, e);
-    //         }
-    //     }
-    // });
+                const entry = ctx.registry.getEntry('object', objectName);
+                if (entry) {
+                    const config = entry.content as ObjectConfig;
+                    config.data = data; 
+                } else {
+                    console.warn(`Found data for unknown object '${objectName}' in ${ctx.file}`);
+                }
+            } catch (e) {
+                console.error(`Error loading data from ${ctx.file}:`, e);
+            }
+        }
+    });
 }
 
 function registerObject(registry: any, obj: any, file: string, packageName?: string) {