@objectstack/objectql 0.6.0 → 0.7.1

package/dist/index.js

@@ -1,344 +1,9 @@
-import { SchemaRegistry } from './registry';
-// Export Registry for consumers
+// Export Registry
 export { SchemaRegistry } from './registry';
+// Export Protocol Implementation
 export { ObjectStackProtocolImplementation } from './protocol';
-/**
- * ObjectQL Engine
- *
- * Implements the IDataEngine interface for data persistence.
- */
-export class ObjectQL {
-    constructor(hostContext = {}) {
-        this.drivers = new Map();
-        this.defaultDriver = null;
-        // Hooks Registry
-        this.hooks = {
-            'beforeFind': [], 'afterFind': [],
-            'beforeInsert': [], 'afterInsert': [],
-            'beforeUpdate': [], 'afterUpdate': [],
-            'beforeDelete': [], 'afterDelete': [],
-        };
-        // Host provided context additions (e.g. Server router)
-        this.hostContext = {};
-        this.hostContext = hostContext;
-        console.log(`[ObjectQL] Engine Instance Created`);
-    }
-    /**
-     * Load and Register a Plugin
-     */
-    async use(manifestPart, runtimePart) {
-        // 1. Validate / Register Manifest
-        if (manifestPart) {
-            this.registerApp(manifestPart);
-        }
-        // 2. Execute Runtime
-        if (runtimePart) {
-            const pluginDef = runtimePart.default || runtimePart;
-            if (pluginDef.onEnable) {
-                const context = {
-                    ql: this,
-                    logger: console,
-                    // Expose the driver registry helper explicitly if needed
-                    drivers: {
-                        register: (driver) => this.registerDriver(driver)
-                    },
-                    ...this.hostContext
-                };
-                await pluginDef.onEnable(context);
-            }
-        }
-    }
-    /**
-     * Register a hook
-     * @param event The event name (e.g. 'beforeFind', 'afterInsert')
-     * @param handler The handler function
-     */
-    registerHook(event, handler) {
-        if (!this.hooks[event]) {
-            this.hooks[event] = [];
-        }
-        this.hooks[event].push(handler);
-        console.log(`[ObjectQL] Registered hook for ${event}`);
-    }
-    async triggerHooks(event, context) {
-        const handlers = this.hooks[event] || [];
-        for (const handler of handlers) {
-            // In a real system, we might want to catch errors here or allow them to bubble up
-            await handler(context);
-        }
-    }
-    registerApp(manifestPart) {
-        // 1. Handle Module Imports (commonjs/esm interop)
-        // If the passed object is a module namespace with a default export, use that.
-        const raw = manifestPart.default || manifestPart;
-        // Support nested manifest property (Stack Definition)
-        // We merge the inner manifest metadata (id, version, etc) with the outer container (objects, apps)
-        const manifest = raw.manifest ? { ...raw, ...raw.manifest } : raw;
-        // In a real scenario, we might strictly parse this using Zod
-        // For now, simple ID check
-        const id = manifest.id || manifest.name;
-        if (!id) {
-            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 App: ${id}`);
-        SchemaRegistry.registerPlugin(manifest);
-        // 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 (manifest.contributes?.kinds) {
-            for (const kind of manifest.contributes.kinds) {
-                SchemaRegistry.registerKind(kind);
-            }
-        }
-    }
-    /**
-     * Register a new storage driver
-     */
-    registerDriver(driver, isDefault = false) {
-        if (this.drivers.has(driver.name)) {
-            console.warn(`[ObjectQL] Driver ${driver.name} is already registered. Skipping.`);
-            return;
-        }
-        this.drivers.set(driver.name, driver);
-        console.log(`[ObjectQL] Registered driver: ${driver.name} v${driver.version}`);
-        if (isDefault || this.drivers.size === 1) {
-            this.defaultDriver = driver.name;
-        }
-    }
-    /**
-     * Helper to get object definition
-     */
-    getSchema(objectName) {
-        return SchemaRegistry.getObject(objectName);
-    }
-    /**
-     * Helper to get the target driver
-     */
-    getDriver(objectName) {
-        const object = SchemaRegistry.getObject(objectName);
-        // 1. If object definition exists, check for explicit datasource
-        if (object) {
-            const datasourceName = object.datasource || 'default';
-            // If configured for 'default', try to find the default driver
-            if (datasourceName === 'default') {
-                if (this.defaultDriver && this.drivers.has(this.defaultDriver)) {
-                    return this.drivers.get(this.defaultDriver);
-                }
-                // Fallback: If 'default' not explicitly set, use the first available driver?
-                // Better to be strict.
-            }
-            else {
-                // Specific datasource requested
-                if (this.drivers.has(datasourceName)) {
-                    return this.drivers.get(datasourceName);
-                }
-                // If not found, fall back to default? Or error?
-                // Standard behavior: Error if specific datasource is missing.
-                throw new Error(`[ObjectQL] Datasource '${datasourceName}' configured for object '${objectName}' is not registered.`);
-            }
-        }
-        // 2. Fallback for ad-hoc objects or missing definitions
-        // If we have a default driver, use it.
-        if (this.defaultDriver) {
-            if (!object) {
-                console.warn(`[ObjectQL] Object '${objectName}' not found in registry. Using default driver.`);
-            }
-            return this.drivers.get(this.defaultDriver);
-        }
-        throw new Error(`[ObjectQL] No driver available for object '${objectName}'`);
-    }
-    /**
-     * Initialize the engine and all registered drivers
-     */
-    async init() {
-        console.log('[ObjectQL] Initializing drivers...');
-        for (const [name, driver] of this.drivers) {
-            try {
-                await driver.connect();
-            }
-            catch (e) {
-                console.error(`[ObjectQL] Failed to connect driver ${name}`, e);
-            }
-        }
-        // In a real app, we would sync schemas here
-    }
-    async destroy() {
-        for (const driver of this.drivers.values()) {
-            await driver.disconnect();
-        }
-    }
-    // ============================================
-    // Data Access Methods (IDataEngine Interface)
-    // ============================================
-    /**
-     * Find records matching a query (IDataEngine interface)
-     *
-     * @param object - Object name
-     * @param query - Query options (IDataEngine format)
-     * @returns Promise resolving to array of records
-     */
-    async find(object, query) {
-        const driver = this.getDriver(object);
-        // Convert DataEngineQueryOptions to QueryAST
-        let ast = { object };
-        if (query) {
-            // Map DataEngineQueryOptions to QueryAST
-            if (query.filter) {
-                ast.where = query.filter;
-            }
-            if (query.select) {
-                ast.fields = query.select;
-            }
-            if (query.sort) {
-                // Convert sort Record to orderBy array
-                // sort: { createdAt: -1, name: 'asc' } => orderBy: [{ field: 'createdAt', order: 'desc' }, { field: 'name', order: 'asc' }]
-                ast.orderBy = Object.entries(query.sort).map(([field, order]) => ({
-                    field,
-                    order: (order === -1 || order === 'desc') ? 'desc' : 'asc'
-                }));
-            }
-            // Handle both limit and top (top takes precedence)
-            if (query.top !== undefined) {
-                ast.limit = query.top;
-            }
-            else if (query.limit !== undefined) {
-                ast.limit = query.limit;
-            }
-            if (query.skip !== undefined) {
-                ast.offset = query.skip;
-            }
-        }
-        // Set default limit if not specified
-        if (ast.limit === undefined)
-            ast.limit = 100;
-        // Trigger Before Hook
-        const hookContext = {
-            object,
-            event: 'beforeFind',
-            input: { ast, options: undefined },
-            ql: this
-        };
-        await this.triggerHooks('beforeFind', hookContext);
-        try {
-            const result = await driver.find(object, hookContext.input.ast, hookContext.input.options);
-            // Trigger After Hook
-            hookContext.event = 'afterFind';
-            hookContext.result = result;
-            await this.triggerHooks('afterFind', hookContext);
-            return hookContext.result;
-        }
-        catch (e) {
-            // hookContext.error = e;
-            throw e;
-        }
-    }
-    async findOne(object, idOrQuery, options) {
-        const driver = this.getDriver(object);
-        let ast;
-        if (typeof idOrQuery === 'string') {
-            ast = {
-                object,
-                where: { _id: idOrQuery }
-            };
-        }
-        else {
-            // Assume query object
-            // reuse logic from find() or just wrap it
-            if (idOrQuery.where || idOrQuery.fields) {
-                ast = { object, ...idOrQuery };
-            }
-            else {
-                ast = { object, where: idOrQuery };
-            }
-        }
-        // Limit 1 for findOne
-        ast.limit = 1;
-        return driver.findOne(object, ast, options);
-    }
-    /**
-     * Insert a new record (IDataEngine interface)
-     *
-     * @param object - Object name
-     * @param data - Data to insert
-     * @returns Promise resolving to the created record
-     */
-    async insert(object, data) {
-        const driver = this.getDriver(object);
-        // 1. Get Schema
-        const schema = SchemaRegistry.getObject(object);
-        if (schema) {
-            // TODO: Validation Logic
-            // validate(schema, data);
-        }
-        // 2. Trigger Before Hook
-        const hookContext = {
-            object,
-            event: 'beforeInsert',
-            input: { data, options: undefined },
-            ql: this
-        };
-        await this.triggerHooks('beforeInsert', hookContext);
-        // 3. Execute Driver
-        const result = await driver.create(object, hookContext.input.data, hookContext.input.options);
-        // 4. Trigger After Hook
-        hookContext.event = 'afterInsert';
-        hookContext.result = result;
-        await this.triggerHooks('afterInsert', hookContext);
-        return hookContext.result;
-    }
-    /**
-     * Update a record by ID (IDataEngine interface)
-     *
-     * @param object - Object name
-     * @param id - Record ID
-     * @param data - Updated data
-     * @returns Promise resolving to the updated record
-     */
-    async update(object, id, data) {
-        const driver = this.getDriver(object);
-        const hookContext = {
-            object,
-            event: 'beforeUpdate',
-            input: { id, data, options: undefined },
-            ql: this
-        };
-        await this.triggerHooks('beforeUpdate', hookContext);
-        const result = await driver.update(object, hookContext.input.id, hookContext.input.data, hookContext.input.options);
-        hookContext.event = 'afterUpdate';
-        hookContext.result = result;
-        await this.triggerHooks('afterUpdate', hookContext);
-        return hookContext.result;
-    }
-    /**
-     * Delete a record by ID (IDataEngine interface)
-     *
-     * @param object - Object name
-     * @param id - Record ID
-     * @returns Promise resolving to true if deleted, false otherwise
-     */
-    async delete(object, id) {
-        const driver = this.getDriver(object);
-        const hookContext = {
-            object,
-            event: 'beforeDelete',
-            input: { id, options: undefined },
-            ql: this
-        };
-        await this.triggerHooks('beforeDelete', hookContext);
-        const result = await driver.delete(object, hookContext.input.id, hookContext.input.options);
-        hookContext.event = 'afterDelete';
-        hookContext.result = result;
-        await this.triggerHooks('afterDelete', hookContext);
-        // Driver.delete() already returns boolean per DriverInterface spec
-        return hookContext.result;
-    }
-}
-export * from './plugin';
+// Export Engine
+export { ObjectQL } from './engine';
+// Export Plugin Shim
+export { ObjectQLPlugin } from './plugin';
+// Moved logic to engine.ts

package/dist/plugin.d.ts

@@ -1,4 +1,4 @@
-import { ObjectQL } from './index';
+import { ObjectQL } from './engine';
 import { Plugin, PluginContext } from '@objectstack/core';
 export type { Plugin, PluginContext };
 export declare class ObjectQLPlugin implements Plugin {

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1D,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AAEtC,qBAAa,cAAe,YAAW,MAAM;IAC3C,IAAI,SAAqC;IACzC,IAAI,EAAG,UAAU,CAAU;IAC3B,OAAO,SAAW;IAElB,OAAO,CAAC,EAAE,CAAuB;IACjC,OAAO,CAAC,WAAW,CAAC,CAAsB;gBAE9B,EAAE,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAStD,IAAI,CAAC,GAAG,EAAE,aAAa;IAkBvB,KAAK,CAAC,GAAG,EAAE,aAAa;CAoB/B"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1D,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AAEtC,qBAAa,cAAe,YAAW,MAAM;IAC3C,IAAI,SAAqC;IACzC,IAAI,EAAG,UAAU,CAAU;IAC3B,OAAO,SAAW;IAElB,OAAO,CAAC,EAAE,CAAuB;IACjC,OAAO,CAAC,WAAW,CAAC,CAAsB;gBAE9B,EAAE,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAStD,IAAI,CAAC,GAAG,EAAE,aAAa;IAkBvB,KAAK,CAAC,GAAG,EAAE,aAAa;CAoB/B"}

package/dist/plugin.js

@@ -1,4 +1,4 @@
-import { ObjectQL } from './index';
+import { ObjectQL } from './engine';
 import { ObjectStackProtocolImplementation } from './protocol';
 export class ObjectQLPlugin {
     constructor(ql, hostContext) {
@@ -18,20 +18,17 @@ export class ObjectQLPlugin {
             this.ql = new ObjectQL(this.hostContext);
         }
         ctx.registerService('objectql', this.ql);
-        if (ctx.logger)
-            ctx.logger.log(`[ObjectQLPlugin] ObjectQL engine registered as service`);
+        ctx.logger.info('ObjectQL engine registered as service');
         // Register Protocol Implementation
         if (!this.ql) {
             throw new Error('ObjectQL engine not initialized');
         }
         const protocolShim = new ObjectStackProtocolImplementation(this.ql);
         ctx.registerService('protocol', protocolShim);
-        if (ctx.logger)
-            ctx.logger.log(`[ObjectQLPlugin] Protocol service registered`);
+        ctx.logger.info('Protocol service registered');
     }
     async start(ctx) {
-        if (ctx.logger)
-            ctx.logger.log(`[ObjectQLPlugin] ObjectQL engine initialized`);
+        ctx.logger.info('ObjectQL engine initialized');
         // Discover features from Kernel Services
         if (ctx.getServices && this.ql) {
             const services = ctx.getServices();
@@ -39,14 +36,12 @@ export class ObjectQLPlugin {
                 if (name.startsWith('driver.')) {
                     // Register Driver
                     this.ql.registerDriver(service);
-                    if (ctx.logger)
-                        ctx.logger.log(`[ObjectQLPlugin] Discovered and registered driver service: ${name}`);
+                    ctx.logger.debug('Discovered and registered driver service', { serviceName: name });
                 }
                 if (name.startsWith('app.')) {
                     // Register App
                     this.ql.registerApp(service); // service is Manifest
-                    if (ctx.logger)
-                        ctx.logger.log(`[ObjectQLPlugin] Discovered and registered app service: ${name}`);
+                    ctx.logger.debug('Discovered and registered app service', { serviceName: name });
                 }
             }
         }

package/dist/protocol.d.ts

@@ -1,43 +1,113 @@
-import { IObjectStackProtocol } from '@objectstack/spec/api';
+import { ObjectStackProtocol } from '@objectstack/spec/api';
 import { IDataEngine } from '@objectstack/core';
-export declare class ObjectStackProtocolImplementation implements IObjectStackProtocol {
+import type { BatchUpdateRequest, BatchUpdateResponse, UpdateManyDataRequest, DeleteManyDataRequest } from '@objectstack/spec/api';
+import type { MetadataCacheRequest, MetadataCacheResponse } from '@objectstack/spec/api';
+import type { CreateViewRequest, UpdateViewRequest, ListViewsRequest, ViewResponse, ListViewsResponse } from '@objectstack/spec/api';
+export declare class ObjectStackProtocolImplementation implements ObjectStackProtocol {
     private engine;
+    private viewStorage;
     constructor(engine: IDataEngine);
-    getDiscovery(): {
-        name: string;
+    getDiscovery(_request: {}): Promise<{
         version: string;
-        capabilities: {
-            metadata: boolean;
-            data: boolean;
-            ui: boolean;
-        };
-    };
-    getMetaTypes(): string[];
-    getMetaItems(type: string): unknown[];
-    getMetaItem(type: string, name: string): unknown;
-    getUiView(object: string, type: 'list' | 'form'): {
+        apiName: string;
+        capabilities: string[];
+        endpoints: {};
+    }>;
+    getMetaTypes(_request: {}): Promise<{
+        types: string[];
+    }>;
+    getMetaItems(request: {
+        type: string;
+    }): Promise<{
+        type: string;
+        items: unknown[];
+    }>;
+    getMetaItem(request: {
+        type: string;
+        name: string;
+    }): Promise<{
         type: string;
+        name: string;
+        item: unknown;
+    }>;
+    getUiView(request: {
+        object: string;
+        type: 'list' | 'form';
+    }): Promise<{
+        object: string;
+        type: "list" | "form";
+        view: any;
+    }>;
+    findData(request: {
+        object: string;
+        query?: any;
+    }): Promise<{
+        object: string;
+        value: any[];
+        records: any[];
+        total: number;
+        hasMore: boolean;
+    }>;
+    getData(request: {
         object: string;
-        columns: {
-            field: string;
-            label: string;
-        }[];
-        sections?: undefined;
-    } | {
+        id: string;
+    }): Promise<{
+        object: string;
+        id: string;
+        record: any;
+    }>;
+    createData(request: {
+        object: string;
+        data: any;
+    }): Promise<{
+        object: string;
+        id: any;
+        record: any;
+    }>;
+    updateData(request: {
+        object: string;
+        id: string;
+        data: any;
+    }): Promise<{
+        object: string;
+        id: string;
+        record: any;
+    }>;
+    deleteData(request: {
+        object: string;
+        id: string;
+    }): Promise<{
+        object: string;
+        id: string;
+        success: boolean;
+    }>;
+    getMetaItemCached(request: {
         type: string;
+        name: string;
+        cacheRequest?: MetadataCacheRequest;
+    }): Promise<MetadataCacheResponse>;
+    batchData(_request: {
+        object: string;
+        request: BatchUpdateRequest;
+    }): Promise<BatchUpdateResponse>;
+    createManyData(request: {
+        object: string;
+        records: any[];
+    }): Promise<any>;
+    updateManyData(_request: UpdateManyDataRequest): Promise<any>;
+    deleteManyData(request: DeleteManyDataRequest): Promise<any>;
+    createView(request: CreateViewRequest): Promise<ViewResponse>;
+    getView(request: {
+        id: string;
+    }): Promise<ViewResponse>;
+    listViews(request: ListViewsRequest): Promise<ListViewsResponse>;
+    updateView(request: UpdateViewRequest): Promise<ViewResponse>;
+    deleteView(request: {
+        id: string;
+    }): Promise<{
+        success: boolean;
         object: string;
-        sections: {
-            label: string;
-            fields: {
-                field: string;
-            }[];
-        }[];
-        columns?: undefined;
-    };
-    findData(object: string, query: any): Promise<any[]>;
-    getData(object: string, id: string): Promise<any>;
-    createData(object: string, data: any): Promise<any>;
-    updateData(object: string, id: string, data: any): Promise<any>;
-    deleteData(object: string, id: string): Promise<boolean>;
+        id: string;
+    }>;
 }
 //# sourceMappingURL=protocol.d.ts.map

package/dist/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAKhD,qBAAa,iCAAkC,YAAW,oBAAoB;IAC1E,OAAO,CAAC,MAAM,CAAc;gBAEhB,MAAM,EAAE,WAAW;IAI/B,YAAY;;;;;;;;;IAYZ,YAAY;IAIZ,YAAY,CAAC,IAAI,EAAE,MAAM;IAIzB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAItC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;;;;;;;;;;;;;;;;;;;IA6B/C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAI7B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAsBxC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAIpC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAIhD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGxC"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}