@objectql/core 1.1.0 → 1.2.0

package/src/index.ts

@@ -1,49 +1,196 @@
-import * as path from 'path';
-
-export * from './metadata';
-export * from './types';
-export * from './driver';
-export * from './repository';
-export * from './query';
-export * from './registry';
+import { 
+    ObjectRegistry, 
+    Driver, 
+    ObjectConfig, 
+    ObjectQLContext, 
+    ObjectQLContextOptions, 
+    IObjectQL, 
+    ObjectQLConfig,
+    ObjectQLPlugin,
+    HookName,
+    HookHandler,
+    HookContext,
+    ActionHandler,
+    ActionContext
+} from '@objectql/types';
+import { ObjectLoader } from './loader';
 export * from './loader';
-
-import { ObjectConfig } from './metadata';
-import { ObjectQLContext, ObjectQLContextOptions, IObjectQL, ObjectQLConfig } from './types';
 import { ObjectRepository } from './repository';
-import { Driver } from './driver';
-import { MetadataLoader } from './loader';
-import { MetadataRegistry } from './registry';
 
 export class ObjectQL implements IObjectQL {
-    public metadata: MetadataRegistry;
-    private loader: MetadataLoader;
+    public metadata: ObjectRegistry;
+    private loader: ObjectLoader;
     private datasources: Record<string, Driver> = {};
+    private hooks: Record<string, Array<{ objectName: string, handler: HookHandler, packageName?: string }>> = {};
+    private actions: Record<string, { handler: ActionHandler, packageName?: string }> = {};
+    private pluginsList: ObjectQLPlugin[] = [];
 
     constructor(config: ObjectQLConfig) {
-        this.metadata = config.registry || new MetadataRegistry();
-        this.loader = new MetadataLoader(this.metadata);
-        this.datasources = config.datasources;
+        this.metadata = config.registry || new ObjectRegistry();
+        this.loader = new ObjectLoader(this.metadata);
+        this.datasources = config.datasources || {};
+        
+        if (config.connection) {
+            this.loadDriverFromConnection(config.connection);
+        }
+
+        // 1. Load Presets/Packages first (Base Layer)
+        if (config.packages) {
+            for (const name of config.packages) {
+                this.addPackage(name);
+            }
+        }
+        if (config.presets) {
+            for (const name of config.presets) {
+                this.addPackage(name);
+            }
+        }
+        
+        if (config.plugins) {
+            for (const plugin of config.plugins) {
+                if (typeof plugin === 'string') {
+                    this.loadPluginFromPackage(plugin);
+                } else {
+                    this.use(plugin);
+                }
+            }
+        }
 
+        // 2. Load Local Sources (Application Layer - can override presets)
+        if (config.source) {
+            const sources = Array.isArray(config.source) ? config.source : [config.source];
+            for (const src of sources) {
+                this.loader.load(src);
+            }
+        }
+
+        // 3. Load In-Memory Objects (Dynamic Layer - highest priority)
         if (config.objects) {
             for (const [key, obj] of Object.entries(config.objects)) {
                 this.registerObject(obj);
             }
         }
-        if (config.packages) {
-            for (const name of config.packages) {
-                this.addPackage(name);
+    }
+
+    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);
     }
 
+    use(plugin: ObjectQLPlugin) {
+        this.pluginsList.push(plugin);
+    }
 
     removePackage(name: string) {
         this.metadata.unregisterPackage(name);
+        
+        // Remove hooks
+        for (const event of Object.keys(this.hooks)) {
+            this.hooks[event] = this.hooks[event].filter(h => h.packageName !== name);
+        }
+        
+        // Remove actions
+        for (const key of Object.keys(this.actions)) {
+            if (this.actions[key].packageName === name) {
+                delete this.actions[key];
+            }
+        }
+    }
+
+    on(event: HookName, objectName: string, handler: HookHandler, packageName?: string) {
+        if (!this.hooks[event]) {
+            this.hooks[event] = [];
+        }
+        this.hooks[event].push({ 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);
+            }
+        }
+    }
+
+    registerAction(objectName: string, actionName: string, handler: ActionHandler, packageName?: string) {
+        const key = `${objectName}:${actionName}`;
+        this.actions[key] = { 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}'`);
     }
 
     loadFromDirectory(dir: string, packageName?: string) {
@@ -56,7 +203,6 @@ export class ObjectQL implements IObjectQL {
             spaceId: options.spaceId,
             roles: options.roles || [],
             isSystem: options.isSystem,
-            ignoreTriggers: options.ignoreTriggers,
             object: (name: string) => {
                 return new ObjectRepository(name, ctx, this);
             },
@@ -111,6 +257,10 @@ export class ObjectQL implements IObjectQL {
         });
     }
 
+    unregisterObject(name: string) {
+        this.metadata.unregister('object', name);
+    }
+
     getObject(name: string): ObjectConfig | undefined {
         return this.metadata.get<ObjectConfig>('object', name);
     }
@@ -133,27 +283,97 @@ export class ObjectQL implements IObjectQL {
     }
 
     async init() {
-        const ctx = this.createContext({ isSystem: true });
-        const objects = this.metadata.list<ObjectConfig>('object');
-        for (const obj of objects) {
-            if (obj.data && obj.data.length > 0) {
-                console.log(`Initializing data for object ${obj.name}...`);
-                const repo = ctx.object(obj.name);
-                for (const record of obj.data) {
-                    try {
-                        if (record._id) {
-                             const existing = await repo.findOne(record._id);
-                             if (existing) {
-                                 continue;
-                             }
+        // 0. Init Plugins
+        for (const plugin of this.pluginsList) {
+            console.log(`Initializing plugin '${plugin.name}'...`);
+            
+            let app: IObjectQL = this;
+            const pkgName = (plugin as any)._packageName;
+
+            if (pkgName) {
+                app = new Proxy(this, {
+                    get(target, prop) {
+                        if (prop === 'on') {
+                            return (event: HookName, obj: string, handler: HookHandler) => 
+                                target.on(event, obj, handler, pkgName);
+                        }
+                        if (prop === 'registerAction') {
+                            return (obj: string, act: string, handler: ActionHandler) => 
+                                target.registerAction(obj, act, handler, pkgName);
                         }
-                        await repo.create(record);
-                        console.log(`Inserted init data for ${obj.name}: ${record._id || 'unknown id'}`);
-                    } catch (e) {
-                        console.error(`Failed to insert init data for ${obj.name}:`, e);
+                        const value = (target as any)[prop];
+                        return typeof value === 'function' ? value.bind(target) : value;
                     }
-                }
+                });
+            }
+
+            await plugin.setup(app);
+        }
+
+        const objects = this.metadata.list<ObjectConfig>('object');
+        
+        // 1. Init Drivers (e.g. Sync Schema)
+        // Let's pass all objects to all configured drivers.
+        for (const [name, driver] of Object.entries(this.datasources)) {
+            if (driver.init) {
+                console.log(`Initializing driver '${name}'...`);
+                await driver.init(objects);
             }
         }
     }
+
+    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}`);
+        }
+    }
 }
+
+export * from './repository';

package/src/loader.ts

@@ -1,17 +1,202 @@
-import { MetadataRegistry } from './registry';
-import { ObjectConfig } from './types';
-import { MetadataLoader as BaseLoader, registerObjectQLPlugins } from '@objectql/metadata';
+import * as fs from 'fs';
+import * as glob from 'fast-glob';
+import * as path from 'path';
+import { ObjectRegistry, ObjectConfig } from '@objectql/types';
+import * as yaml from 'js-yaml';
 
-export class MetadataLoader extends BaseLoader {
-    constructor(registry: MetadataRegistry) {
-        super(registry);
-        registerObjectQLPlugins(this);
+export interface LoaderHandlerContext {
+    file: string;
+    content: string;
+    registry: ObjectRegistry;
+    packageName?: string;
+}
+
+export type LoaderHandler = (ctx: LoaderHandlerContext) => void;
+
+export interface LoaderPlugin {
+    name: string;
+    glob: string[];
+    handler: LoaderHandler;
+    options?: any;
+}
+
+export class ObjectLoader {
+    private plugins: LoaderPlugin[] = [];
+
+    constructor(protected registry: ObjectRegistry) {
+        this.registerBuiltinPlugins();
+    }
+
+    private registerBuiltinPlugins() {
+        // Objects
+        this.use({
+            name: 'object',
+            glob: ['**/*.object.yml', '**/*.object.yaml'],
+            handler: (ctx) => {
+                try {
+                    const doc = yaml.load(ctx.content) as any;
+                    if (!doc) return;
+
+                    if (doc.name && doc.fields) {
+                        registerObject(ctx.registry, doc, ctx.file, ctx.packageName || ctx.registry.getEntry('package-map', ctx.file)?.package);
+                    } else {
+                        for (const [key, value] of Object.entries(doc)) {
+                            if (typeof value === 'object' && (value as any).fields) {
+                                const obj = value as any;
+                                if (!obj.name) obj.name = key;
+                                registerObject(ctx.registry, obj, ctx.file, ctx.packageName);
+                            }
+                        }
+                    }
+                } catch (e) {
+                    console.error(`Error loading object from ${ctx.file}:`, e);
+                }
+            }
+        });
+
+        // Hooks
+        this.use({
+            name: 'hook',
+            glob: ['**/*.hook.ts', '**/*.hook.js'],
+            handler: (ctx) => {
+                const basename = path.basename(ctx.file);
+                // Extract object name from filename: user.hook.ts -> user
+                const objectName = basename.replace(/\.hook\.(ts|js)$/, '');
+                
+                try {
+                    const mod = require(ctx.file);
+                    // Support default export or named exports
+                    const hooks = mod.default || mod;
+                    
+                    ctx.registry.register('hook', {
+                        type: 'hook',
+                        id: objectName, // Hook ID is the object name
+                        path: ctx.file,
+                        package: ctx.packageName,
+                        content: hooks
+                    });
+                } catch (e) {
+                    console.error(`Error loading hook from ${ctx.file}:`, e);
+                }
+            }
+        });
+        
+        // Actions
+        this.use({
+            name: 'action',
+            glob: ['**/*.action.ts', '**/*.action.js'],
+            handler: (ctx) => {
+                const basename = path.basename(ctx.file);
+                // Extract object name: invoice.action.ts -> invoice
+                const objectName = basename.replace(/\.action\.(ts|js)$/, '');
+                
+                try {
+                    const mod = require(ctx.file);
+                    // Action file exports multiple actions
+                    // export const approve = { ... };
+                    // export const reject = { ... };
+                    
+                    const actions: Record<string, any> = {};
+                    
+                    for (const [key, value] of Object.entries(mod)) {
+                        if (key === 'default') continue;
+                        if (typeof value === 'object' && (value as any).handler) {
+                            actions[key] = value;
+                        }
+                    }
+                    
+                    if (Object.keys(actions).length > 0) {
+                         ctx.registry.register('action', {
+                            type: 'action',
+                            id: objectName, // Action collection ID is the object name
+                            path: ctx.file,
+                            package: ctx.packageName,
+                            content: actions
+                        });
+                    }
+
+                } catch (e) {
+                    console.error(`Error loading action from ${ctx.file}:`, e);
+                }
+            }
+        });
+    }
+
+    use(plugin: LoaderPlugin) {
+        this.plugins.push(plugin);
     }
+
+    load(dir: string, packageName?: string) {
+        for (const plugin of this.plugins) {
+            this.runPlugin(plugin, dir, packageName);
+        }
+    }
+
+    loadPackage(packageName: string) {
+        try {
+            const entryPath = require.resolve(packageName, { paths: [process.cwd()] });
+            // clean cache
+            delete require.cache[entryPath];
+            const packageDir = path.dirname(entryPath);
+            this.load(packageDir, packageName);
+        } catch (e) {
+            // fallback to directory
+            this.load(packageName, packageName);
+        }
+    }
+
+    private runPlugin(plugin: LoaderPlugin, dir: string, packageName?: string) {
+        const files = glob.sync(plugin.glob, {
+            cwd: dir,
+            absolute: true
+        });
+
+        for (const file of files) {
+            try {
+                const ctx: LoaderHandlerContext = {
+                    file,
+                    content: '',
+                    registry: this.registry,
+                    packageName
+                };
+                
+                // Pre-read for convenience
+                if (!file.match(/\.(js|ts|node)$/)) {
+                    ctx.content = fs.readFileSync(file, 'utf8');
+                }
+
+                plugin.handler(ctx);
+
+            } catch (e) {
+                console.error(`Error in loader plugin '${plugin.name}' processing ${file}:`, e);
+            }
+        }
+    }
+}
+
+function registerObject(registry: ObjectRegistry, obj: any, file: string, packageName?: string) {
+    // Normalize fields
+    if (obj.fields) {
+        for (const [key, field] of Object.entries(obj.fields)) {
+            if (typeof field === 'object' && field !== null) {
+                if (!(field as any).name) {
+                    (field as any).name = key;
+                }
+            }
+        }
+    }
+    registry.register('object', {
+        type: 'object',
+        id: obj.name,
+        path: file,
+        package: packageName,
+        content: obj
+    });
 }
 
 export function loadObjectConfigs(dir: string): Record<string, ObjectConfig> {
-    const registry = new MetadataRegistry();
-    const loader = new MetadataLoader(registry);
+    const registry = new ObjectRegistry();
+    const loader = new ObjectLoader(registry);
     loader.load(dir);
     const result: Record<string, ObjectConfig> = {};
     for (const obj of registry.list<ObjectConfig>('object')) {
@@ -19,4 +204,3 @@ export function loadObjectConfigs(dir: string): Record<string, ObjectConfig> {
     }
     return result;
 }
-