Refactor ObjectQLPlugin and update imports for better structure

Author: hotlong

examples/host/src/index.ts

@@ -1,5 +1,6 @@
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin, AppManifestPlugin, ObjectQL } from '@objectstack/runtime';
+import { ObjectKernel, DriverPlugin, AppManifestPlugin, ObjectQL } from '@objectstack/runtime';
 import { InMemoryDriver } from '@objectstack/driver-memory';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 import { HonoServerPlugin } from '@objectstack/plugin-hono-server';
 
 import CrmApp from '@objectstack/example-crm/objectstack.config';

packages/objectql/package.json

@@ -9,7 +9,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@objectstack/spec": "workspace:*"
+    "@objectstack/spec": "workspace:*",
+    "@objectstack/types": "workspace:*"
   },
   "devDependencies": {
     "typescript": "^5.0.0",

packages/objectql/src/index.ts

@@ -402,3 +402,4 @@ export class ObjectQL implements IDataEngine {
     return hookContext.result;
   }
 }
+export * from './plugin';

packages/objectql/src/plugin.ts

@@ -0,0 +1,39 @@
+import { ObjectQL } from './index';
+
+// Minimal Context interface to avoid circular dependency on @objectstack/runtime
+export interface PluginContext {
+    registerService(name: string, service: any): void;
+    logger: Console;
+    [key: string]: any;
+}
+
+export class ObjectQLPlugin {
+  name = 'com.objectstack.engine.objectql';
+  type = 'objectql' as const;
+  version = '1.0.0';
+  
+  private ql: ObjectQL | undefined;
+  private hostContext?: Record<string, any>;
+
+  constructor(ql?: ObjectQL, hostContext?: Record<string, any>) {
+    if (ql) {
+        this.ql = ql;
+    } else {
+        this.hostContext = hostContext;
+        // Lazily created in init
+    }
+  }
+
+  async init(ctx: PluginContext) {
+    if (!this.ql) {
+        this.ql = new ObjectQL(this.hostContext);
+    }
+    
+    ctx.registerService('objectql', this.ql);
+    if(ctx.logger) ctx.logger.log(`[ObjectQLPlugin] ObjectQL engine registered as service`);
+  }
+
+  async start(ctx: PluginContext) {
+    if(ctx.logger) ctx.logger.log(`[ObjectQLPlugin] ObjectQL engine initialized`);
+  }
+}

packages/runtime/src/index.ts

@@ -5,7 +5,7 @@ export { ObjectQL, SchemaRegistry } from '@objectstack/objectql';
 export { ObjectKernel } from './mini-kernel.js';
 
 // Export Plugins
-export { ObjectQLPlugin } from './objectql-plugin.js';
+export { ObjectQLPlugin } from '@objectstack/objectql';
 export { DriverPlugin } from './driver-plugin.js';
 export { AppManifestPlugin } from './app-manifest-plugin.js';