@objectql/core 4.0.2 → 4.0.3

package/test/plugin-integration.test.ts

@@ -7,12 +7,12 @@
  */
 
 import { ObjectQLPlugin } from '../src/plugin';
-import { ValidatorPlugin } from '../src/validator-plugin';
-import { FormulaPlugin } from '../src/formula-plugin';
+import { ValidatorPlugin } from '@objectql/plugin-validator';
+import { FormulaPlugin } from '@objectql/plugin-formula';
 
 // Mock the sub-plugins
-jest.mock('../src/validator-plugin');
-jest.mock('../src/formula-plugin');
+jest.mock('@objectql/plugin-validator');
+jest.mock('@objectql/plugin-formula');
 
 describe('ObjectQLPlugin Integration', () => {
     let plugin: ObjectQLPlugin;
@@ -29,7 +29,7 @@ describe('ObjectQLPlugin Integration', () => {
             registerFormulaProvider: jest.fn(),
         };
         
-        mockContext = { engine: mockKernel };
+        mockContext = { app: mockKernel };
         
         // Setup mock implementations
         (ValidatorPlugin as jest.Mock).mockImplementation(() => ({
@@ -45,7 +45,7 @@ describe('ObjectQLPlugin Integration', () => {
         it('should have correct name and version', () => {
             plugin = new ObjectQLPlugin();
             expect(plugin.name).toBe('@objectql/core');
-            expect(plugin.version).toBe('4.0.0');
+            expect(plugin.version).toBe('4.0.2');
         });
     });
 
@@ -89,32 +89,36 @@ describe('ObjectQLPlugin Integration', () => {
     describe('Installation - Conditional Plugin Loading', () => {
         it('should install validator plugin when enabled', async () => {
             plugin = new ObjectQLPlugin({ enableValidator: true });
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(ValidatorPlugin).toHaveBeenCalled();
             const validatorInstance = (ValidatorPlugin as jest.Mock).mock.results[0].value;
-            expect(validatorInstance.install).toHaveBeenCalledWith(mockContext);
+            expect(validatorInstance.install).toHaveBeenCalledWith(runtimeContext);
         });
 
         it('should not install validator plugin when disabled', async () => {
             plugin = new ObjectQLPlugin({ enableValidator: false });
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(ValidatorPlugin).not.toHaveBeenCalled();
         });
 
         it('should install formula plugin when enabled', async () => {
             plugin = new ObjectQLPlugin({ enableFormulas: true });
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(FormulaPlugin).toHaveBeenCalled();
             const formulaInstance = (FormulaPlugin as jest.Mock).mock.results[0].value;
-            expect(formulaInstance.install).toHaveBeenCalledWith(mockContext);
+            expect(formulaInstance.install).toHaveBeenCalledWith(runtimeContext);
         });
 
         it('should not install formula plugin when disabled', async () => {
             plugin = new ObjectQLPlugin({ enableFormulas: false });
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(FormulaPlugin).not.toHaveBeenCalled();
         });
@@ -130,7 +134,8 @@ describe('ObjectQLPlugin Integration', () => {
                 validatorConfig,
             });
             
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(ValidatorPlugin).toHaveBeenCalledWith(validatorConfig);
         });
@@ -146,7 +151,8 @@ describe('ObjectQLPlugin Integration', () => {
                 formulaConfig,
             });
             
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(FormulaPlugin).toHaveBeenCalledWith(formulaConfig);
         });
@@ -157,7 +163,8 @@ describe('ObjectQLPlugin Integration', () => {
                 enableFormulas: true,
             });
             
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(ValidatorPlugin).toHaveBeenCalled();
             expect(FormulaPlugin).toHaveBeenCalled();
@@ -171,7 +178,8 @@ describe('ObjectQLPlugin Integration', () => {
                 enableAI: false,
             });
             
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             expect(ValidatorPlugin).not.toHaveBeenCalled();
             expect(FormulaPlugin).not.toHaveBeenCalled();
@@ -183,15 +191,17 @@ describe('ObjectQLPlugin Integration', () => {
             plugin = new ObjectQLPlugin();
             expect(typeof plugin.onStart).toBe('function');
             
+            const runtimeContext = { engine: mockContext.app };
             // Should not throw when called
-            await expect(plugin.onStart(mockContext)).resolves.not.toThrow();
+            await expect(plugin.onStart(runtimeContext)).resolves.not.toThrow();
         });
     });
 
     describe('Default Configuration', () => {
         it('should enable all features by default', async () => {
             plugin = new ObjectQLPlugin();
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             // Validator and Formula should be installed by default
             expect(ValidatorPlugin).toHaveBeenCalled();
@@ -203,7 +213,8 @@ describe('ObjectQLPlugin Integration', () => {
                 // Explicitly not setting enableValidator or enableFormulas
             });
             
-            await plugin.install(mockContext);
+            const runtimeContext = { engine: mockContext.app };
+            await plugin.install(runtimeContext);
             
             // Both should still be installed
             expect(ValidatorPlugin).toHaveBeenCalled();

package/tsconfig.json

@@ -7,13 +7,11 @@
   "include": ["src/**/*"],
   "exclude": [
     "node_modules", 
-    "dist", 
-    // Exclude external @objectstack/objectql package that has type incompatibilities
-    // with our stub packages during migration phase
-    "../../../node_modules/@objectstack+objectql"
+    "dist"
   ],
   "references": [
-    { "path": "../../objectstack/runtime" },
-    { "path": "../types" }
+    { "path": "../types" },
+    { "path": "../plugin-validator" },
+    { "path": "../plugin-formula" }
   ]
 }