重构 ObjectQL 类，添加插件、驱动、远程和动作支持，优化钩子和对象注册逻辑

Author: hotlong

packages/core/src/action.ts

@@ -0,0 +1,40 @@
+import { ActionContext, ActionHandler, ObjectRegistry } from '@objectql/types';
+
+export interface ActionEntry {
+    handler: ActionHandler;
+    packageName?: string;
+}
+
+export function registerActionHelper(
+    actions: Record<string, ActionEntry>,
+    objectName: string,
+    actionName: string,
+    handler: ActionHandler,
+    packageName?: string
+) {
+    const key = `${objectName}:${actionName}`;
+    actions[key] = { handler, packageName };
+}
+
+export async function executeActionHelper(
+    metadata: ObjectRegistry,
+    runtimeActions: Record<string, ActionEntry>,
+    objectName: string,
+    actionName: string,
+    ctx: ActionContext
+) {
+    // 1. Programmatic
+    const key = `${objectName}:${actionName}`;
+    const actionEntry = runtimeActions[key];
+    if (actionEntry) {
+        return await actionEntry.handler(ctx);
+    }
+
+    // 2. Registry (File-based)
+    const fileActions = metadata.get<any>('action', objectName);
+    if (fileActions && typeof fileActions[actionName] === 'function') {
+        return await fileActions[actionName](ctx);
+    }
+
+    throw new Error(`Action '${actionName}' not found for object '${objectName}'`);
+}

packages/core/src/app.ts

@@ -15,15 +15,20 @@ import {
 } from '@objectql/types';
 import { ObjectLoader } from './loader';
 import { ObjectRepository } from './repository';
-import { RemoteDriver } from '@objectql/driver-remote';
+import { loadPlugin } from './plugin';
+import { createDriverFromConnection } from './driver';
+import { loadRemoteFromUrl } from './remote';
+import { executeActionHelper, registerActionHelper, ActionEntry } from './action';
+import { registerHookHelper, triggerHookHelper, HookEntry } from './hook';
+import { registerObjectHelper, getConfigsHelper } from './object';
 
 export class ObjectQL implements IObjectQL {
     public metadata: ObjectRegistry;
     private loader: ObjectLoader;
     private datasources: Record<string, Driver> = {};
     private remotes: string[] = [];
-    private hooks: Record<string, Array<{ objectName: string, handler: HookHandler, packageName?: string }>> = {};
-    private actions: Record<string, { handler: ActionHandler, packageName?: string }> = {};
+    private hooks: Record<string, HookEntry[]> = {};
+    private actions: Record<string, ActionEntry> = {};
     private pluginsList: ObjectQLPlugin[] = [];
 
     constructor(config: ObjectQLConfig) {
@@ -33,7 +38,7 @@ export class ObjectQL implements IObjectQL {
         this.remotes = config.remotes || [];
 
         if (config.connection) {
-            this.loadDriverFromConnection(config.connection);
+            this.datasources['default'] = createDriverFromConnection(config.connection);
         }
 
         // 1. Load Presets/Packages first (Base Layer)
@@ -51,7 +56,7 @@ export class ObjectQL implements IObjectQL {
         if (config.plugins) {
             for (const plugin of config.plugins) {
                 if (typeof plugin === 'string') {
-                    this.loadPluginFromPackage(plugin);
+                    this.use(loadPlugin(plugin));
                 } else {
                     this.use(plugin);
                 }
@@ -74,58 +79,6 @@ export class ObjectQL implements IObjectQL {
         }
     }
 
-    private loadPluginFromPackage(packageName: string) {
-        let mod: any;
-        try {
-            const modulePath = require.resolve(packageName, { paths: [process.cwd()] });
-            mod = require(modulePath);
-        } catch (e) {
-            throw new Error(`Failed to resolve plugin '${packageName}': ${e}`);
-        }
-
-        // Helper to find plugin instance
-        const findPlugin = (candidate: any): ObjectQLPlugin | undefined => {
-             if (!candidate) return undefined;
-             
-             // 1. Try treating as Class
-             if (typeof candidate === 'function') {
-                 try {
-                     const inst = new candidate();
-                     if (inst && typeof inst.setup === 'function') {
-                         return inst; // Found it!
-                     }
-                 } catch (e) {
-                     // Not a constructor or instantiation failed
-                 }
-             }
-
-             // 2. Try treating as Instance
-             if (candidate && typeof candidate.setup === 'function') {
-                 if (candidate.name) return candidate;
-             }
-             return undefined;
-        };
-
-        // Search in default, module root, and all named exports
-        let instance = findPlugin(mod.default) || findPlugin(mod);
-        
-        if (!instance && mod && typeof mod === 'object') {
-            for (const key of Object.keys(mod)) {
-                if (key === 'default') continue;
-                instance = findPlugin(mod[key]);
-                if (instance) break;
-            }
-        }
-
-        if (instance) {
-            (instance as any)._packageName = packageName;
-            this.use(instance);
-        } else {
-            console.error(`[PluginLoader] Failed to find ObjectQLPlugin in '${packageName}'. Exports:`, Object.keys(mod));
-            throw new Error(`Plugin '${packageName}' must export a class or object implementing ObjectQLPlugin.`);
-        }
-    }
-
     addPackage(name: string) {
         this.loader.loadPackage(name);
     }
@@ -151,48 +104,19 @@ export class ObjectQL implements IObjectQL {
     }
 
     on(event: HookName, objectName: string, handler: HookHandler, packageName?: string) {
-        if (!this.hooks[event]) {
-            this.hooks[event] = [];
-        }
-        this.hooks[event].push({ objectName, handler, packageName });
+        registerHookHelper(this.hooks, event, objectName, handler, packageName);
     }
 
     async triggerHook(event: HookName, objectName: string, ctx: HookContext) {
-        // 1. Registry Hooks (File-based)
-        const fileHooks = this.metadata.get<any>('hook', objectName);
-        if (fileHooks && typeof fileHooks[event] === 'function') {
-            await fileHooks[event](ctx);
-        }
-
-        // 2. Programmatic Hooks
-        const hooks = this.hooks[event] || [];
-        for (const hook of hooks) {
-            if (hook.objectName === '*' || hook.objectName === objectName) {
-                await hook.handler(ctx);
-            }
-        }
+        await triggerHookHelper(this.metadata, this.hooks, event, objectName, ctx);
     }
 
     registerAction(objectName: string, actionName: string, handler: ActionHandler, packageName?: string) {
-        const key = `${objectName}:${actionName}`;
-        this.actions[key] = { handler, packageName };
+        registerActionHelper(this.actions, objectName, actionName, handler, packageName);
     }
 
     async executeAction(objectName: string, actionName: string, ctx: ActionContext) {
-        // 1. Programmatic
-        const key = `${objectName}:${actionName}`;
-        const actionEntry = this.actions[key];
-        if (actionEntry) {
-            return await actionEntry.handler(ctx);
-        }
-
-        // 2. Registry (File-based)
-        const fileActions = this.metadata.get<any>('action', objectName);
-        if (fileActions && typeof fileActions[actionName] === 'function') {
-            return await fileActions[actionName](ctx);
-        }
-
-        throw new Error(`Action '${actionName}' not found for object '${objectName}'`);
+        return await executeActionHelper(this.metadata, this.actions, objectName, actionName, ctx);
     }
 
     loadFromDirectory(dir: string, packageName?: string) {
@@ -244,19 +168,7 @@ export class ObjectQL implements IObjectQL {
     }
 
     registerObject(object: ObjectConfig) {
-        // Normalize fields
-        if (object.fields) {
-            for (const [key, field] of Object.entries(object.fields)) {
-                if (!field.name) {
-                    field.name = key;
-                }
-            }
-        }
-        this.metadata.register('object', {
-            type: 'object',
-            id: object.name,
-            content: object
-        });
+        registerObjectHelper(this.metadata, object);
     }
 
     unregisterObject(name: string) {
@@ -268,12 +180,7 @@ export class ObjectQL implements IObjectQL {
     }
 
     getConfigs(): Record<string, ObjectConfig> {
-        const result: Record<string, ObjectConfig> = {};
-        const objects = this.metadata.list<ObjectConfig>('object');
-        for (const obj of objects) {
-            result[obj.name] = obj;
-        }
-        return result;
+        return getConfigsHelper(this.metadata);
     }
 
     datasource(name: string): Driver {
@@ -288,7 +195,15 @@ export class ObjectQL implements IObjectQL {
         // -1. Load Remotes
         if (this.remotes.length > 0) {
             console.log(`Loading ${this.remotes.length} remotes...`);
-            await Promise.all(this.remotes.map(url => this.loadRemote(url)));
+            const results = await Promise.all(this.remotes.map(url => loadRemoteFromUrl(url)));
+            for (const res of results) {
+                if (res) {
+                    this.datasources[res.driverName] = res.driver;
+                    for (const obj of res.objects) {
+                        this.registerObject(obj);
+                    }
+                }
+            }
         }
 
         // 0. Init Plugins
@@ -329,95 +244,4 @@ export class ObjectQL implements IObjectQL {
             }
         }
     }
-
-    private loadDriverFromConnection(connection: string) {
-        let driverPackage = '';
-        let driverClass = '';
-        let driverConfig: any = {};
-        
-        if (connection.startsWith('mongodb://')) {
-            driverPackage = '@objectql/driver-mongo';
-            driverClass = 'MongoDriver';
-            driverConfig = { url: connection };
-        } 
-        else if (connection.startsWith('sqlite://')) {
-            driverPackage = '@objectql/driver-knex';
-            driverClass = 'KnexDriver';
-            const filename = connection.replace('sqlite://', '');
-            driverConfig = {
-                client: 'sqlite3',
-                connection: { filename },
-                useNullAsDefault: true
-            };
-        }
-        else if (connection.startsWith('postgres://') || connection.startsWith('postgresql://')) {
-            driverPackage = '@objectql/driver-knex';
-            driverClass = 'KnexDriver';
-            driverConfig = {
-                client: 'pg',
-                connection: connection
-            };
-        }
-        else if (connection.startsWith('mysql://')) {
-            driverPackage = '@objectql/driver-knex';
-            driverClass = 'KnexDriver';
-            driverConfig = {
-                client: 'mysql2',
-                connection: connection
-            };
-        }
-        else {
-            throw new Error(`Unsupported connection protocol: ${connection}`);
-        }
-
-        try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const pkg = require(driverPackage);
-            const DriverClass = pkg[driverClass];
-            if (!DriverClass) {
-                throw new Error(`${driverClass} not found in ${driverPackage}`);
-            }
-            this.datasources['default'] = new DriverClass(driverConfig);
-        } catch (e: any) {
-            throw new Error(`Failed to load driver ${driverPackage}. Please install it: npm install ${driverPackage}. Error: ${e.message}`);
-        }
-    }
-
-    private async loadRemote(url: string) {
-        try {
-            const baseUrl = url.replace(/\/$/, '');
-            const metadataUrl = `${baseUrl}/api/metadata/objects`;
-            
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore - Fetch is available in Node 18+
-            const res = await fetch(metadataUrl);
-            if (!res.ok) {
-                console.warn(`[ObjectQL] Remote ${url} returned ${res.status}`);
-                return;
-            }
-
-            const data = await res.json() as any;
-            if (!data || !data.objects) return;
-
-            const driverName = `remote:${baseUrl}`;
-            this.datasources[driverName] = new RemoteDriver(baseUrl);
-
-            await Promise.all(data.objects.map(async (summary: any) => {
-                try {
-                    // @ts-ignore
-                    const detailRes = await fetch(`${metadataUrl}/${summary.name}`);
-                    if (detailRes.ok) {
-                        const config = await detailRes.json() as ObjectConfig;
-                        config.datasource = driverName;
-                        this.registerObject(config);
-                    }
-                } catch (e) {
-                    console.warn(`[ObjectQL] Failed to load object ${summary.name} from ${url}`);
-                }
-            }));
-
-        } catch (e: any) {
-             console.warn(`[ObjectQL] Remote connection error ${url}: ${e.message}`);
-        }
-    }
 }

packages/core/src/driver.ts

@@ -0,0 +1,54 @@
+import { Driver } from '@objectql/types';
+
+export function createDriverFromConnection(connection: string): Driver {
+    let driverPackage = '';
+    let driverClass = '';
+    let driverConfig: any = {};
+    
+    if (connection.startsWith('mongodb://')) {
+        driverPackage = '@objectql/driver-mongo';
+        driverClass = 'MongoDriver';
+        driverConfig = { url: connection };
+    } 
+    else if (connection.startsWith('sqlite://')) {
+        driverPackage = '@objectql/driver-knex';
+        driverClass = 'KnexDriver';
+        const filename = connection.replace('sqlite://', '');
+        driverConfig = {
+            client: 'sqlite3',
+            connection: { filename },
+            useNullAsDefault: true
+        };
+    }
+    else if (connection.startsWith('postgres://') || connection.startsWith('postgresql://')) {
+        driverPackage = '@objectql/driver-knex';
+        driverClass = 'KnexDriver';
+        driverConfig = {
+            client: 'pg',
+            connection: connection
+        };
+    }
+    else if (connection.startsWith('mysql://')) {
+        driverPackage = '@objectql/driver-knex';
+        driverClass = 'KnexDriver';
+        driverConfig = {
+            client: 'mysql2',
+            connection: connection
+        };
+    }
+    else {
+        throw new Error(`Unsupported connection protocol: ${connection}`);
+    }
+
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const pkg = require(driverPackage);
+        const DriverClass = pkg[driverClass];
+        if (!DriverClass) {
+            throw new Error(`${driverClass} not found in ${driverPackage}`);
+        }
+        return new DriverClass(driverConfig);
+    } catch (e: any) {
+        throw new Error(`Failed to load driver ${driverPackage}. Please install it: npm install ${driverPackage}. Error: ${e.message}`);
+    }
+}