Refactor imports to separate ObjectQL from runtime package and update related examples

Author: hotlong

content/docs/developers/micro-kernel.mdx

@@ -46,7 +46,8 @@ The kernel manages plugin lifecycle and provides core services.
 **API:**
 ```typescript
 import { ObjectKernel } from '@objectstack/core';
-import { ObjectQLPlugin, DriverPlugin } from '@objectstack/runtime';
+import { DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 
 const kernel = new ObjectKernel();
 
@@ -137,7 +138,8 @@ interface PluginContext {
 Registers the ObjectQL query engine as a service.
 
 ```typescript
-import { ObjectKernel, ObjectQLPlugin } from '@objectstack/runtime';
+import { ObjectKernel } from '@objectstack/core';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 
 const kernel = new ObjectKernel();
 
@@ -317,7 +319,8 @@ await kernel.bootstrap();
 ### Integration Tests
 
 ```typescript
-import { describe, it, expect } from 'vitest';
+import { describe, it } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql
 import { ObjectKernel, ObjectQLPlugin } from '@objectstack/runtime';
 
 describe('MyPlugin', () => {
@@ -432,7 +435,8 @@ await ql.loadObjects([Account, Contact]);
 ```
 
 ### After (MicroKernel)
-
+DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql
 ```typescript
 import { ObjectKernel, ObjectQLPlugin, DriverPlugin } from '@objectstack/runtime';
 

examples/complete-event-driven-example.ts

@@ -12,7 +12,7 @@ import { DataEnginePlugin } from './data-engine-plugin';
 import { FlowEnginePlugin } from './flow-engine-plugin';
 import { UiEnginePlugin } from './ui-engine-plugin';
 import { HonoServerPlugin } from '@objectstack/plugin-hono-server';
-import { ObjectQLPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 import { PluginRegistry, createKernelFromConfig } from './config-loader';
 
 /**

examples/custom-objectql-example.ts

@@ -6,7 +6,8 @@
  * custom configuration.
  */
 
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin, ObjectQL } from '@objectstack/runtime';
+import { ObjectKernel, DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin, ObjectQL } from '@objectstack/objectql';
 import { InMemoryDriver } from '@objectstack/driver-memory';
 
 (async () => {

examples/host/debug-registry.ts

@@ -1,6 +1,6 @@
 
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin, AppPlugin } from '@objectstack/runtime';
-import { SchemaRegistry, ObjectQL } from '@objectstack/objectql';
+import { ObjectKernel, DriverPlugin, AppPlugin } from '@objectstack/runtime';
+import { SchemaRegistry, ObjectQL, ObjectQLPlugin } from '@objectstack/objectql';
 import { InMemoryDriver } from '@objectstack/driver-memory';
 
 import TodoApp from '@objectstack/example-todo/objectstack.config';

examples/mini-kernel-example.ts

@@ -5,7 +5,8 @@
  * where ObjectQL, Drivers, and HTTP Server are all equal plugins.
  */
 
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin } from '@objectstack/runtime';
+import { ObjectKernel, DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 
 // Mock driver for demonstration
 const mockDriver = {

examples/msw-react-crud/src/mocks/browser.ts

@@ -5,7 +5,8 @@
  * and the MSW Plugin which automatically exposes the API.
  */
 
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin, AppPlugin } from '@objectstack/runtime';
+import { ObjectKernel, DriverPlugin, AppPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 import { InMemoryDriver } from '@objectstack/driver-memory';
 import { MSWPlugin } from '@objectstack/plugin-msw';
 // import appConfig from '../../objectstack.config';

packages/objectql/README.md

@@ -69,7 +69,8 @@ When building full applications, use the `ObjectKernel` to manage plugins and co
 
 ```typescript
 import { ObjectKernel } from '@objectstack/core';
-import { ObjectQLPlugin, DriverPlugin } from '@objectstack/runtime';
+import { DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 import { InMemoryDriver } from '@objectstack/driver-memory';
 
 const kernel = new ObjectKernel();

packages/runtime/README.md

@@ -24,7 +24,8 @@ npm install @objectstack/runtime
 
 ```typescript
 import { ObjectKernel } from '@objectstack/core';
-import { ObjectQLPlugin, DriverPlugin, AppPlugin } from '@objectstack/runtime';
+import { DriverPlugin, AppPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin } from '@objectstack/objectql';
 import { InMemoryDriver } from '@objectstack/driver-memory';
 
 const kernel = new ObjectKernel();
@@ -47,7 +48,8 @@ await kernel.bootstrap();
 If you have a separate ObjectQL implementation or need custom configuration:
 
 ```typescript
-import { ObjectKernel, ObjectQLPlugin, DriverPlugin, ObjectQL } from '@objectstack/runtime';
+import { ObjectKernel, DriverPlugin } from '@objectstack/runtime';
+import { ObjectQLPlugin, ObjectQL } from '@objectstack/objectql';
 
 // Create custom ObjectQL instance
 const customQL = new ObjectQL({

packages/runtime/package.json

@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "@objectstack/core": "workspace:*",
-    "@objectstack/objectql": "workspace:*",
     "@objectstack/types": "workspace:*",
     "@objectstack/spec": "workspace:*"
   },

packages/runtime/src/app-plugin.ts

@@ -1,5 +1,4 @@
 import { Plugin, PluginContext } from '@objectstack/core';
-import { ObjectQL, ObjectQLHostContext } from '@objectstack/objectql';
 
 /**
  * AppPlugin
@@ -42,7 +41,7 @@ export class AppPlugin implements Plugin {
         // Execute Runtime Step
         // Retrieve ObjectQL engine from services
         // We cast to any/ObjectQL because ctx.getService returns unknown
-        const ql = ctx.getService('objectql') as ObjectQL;
+        const ql = ctx.getService('objectql') as any;
 
         if (!ql) {
             ctx.logger?.warn(`[AppPlugin] ObjectQL engine service not found for app: ${this.name}`);
@@ -55,13 +54,13 @@ export class AppPlugin implements Plugin {
              ctx.logger?.log(`[AppPlugin] Executing runtime.onEnable for: ${this.name}`);
 
              // Construct the Host Context (mirroring old ObjectQL.use logic)
-             const hostContext: ObjectQLHostContext = {
+             const hostContext = {
+                ...ctx,
                 ql,
                 logger: ctx.logger || console,
                 drivers: {
                     register: (driver: any) => ql.registerDriver(driver)
                 },
-                ...ctx
              };
 
              await runtime.onEnable(hostContext);