@objectql/core 4.0.0 → 4.0.1

package/src/formula-plugin.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type { RuntimePlugin, RuntimeContext, ObjectStackKernel } from '@objectstack/runtime';
+import type { RuntimePlugin, RuntimeContext, ObjectStackKernel } from '@objectql/runtime';
 import { FormulaEngine } from './formula-engine';
 import type { FormulaEngineConfig } from '@objectql/types';
 

package/src/index.ts

@@ -7,13 +7,16 @@
  */
 
 // Re-export types from @objectstack packages for API compatibility
-export type { ObjectStackKernel, ObjectStackRuntimeProtocol } from '@objectstack/runtime';
+export type { ObjectStackKernel, ObjectStackRuntimeProtocol } from '@objectql/runtime';
 // Note: @objectstack/objectql types temporarily commented out due to type incompatibilities
 // in the published package. Will be re-enabled when package is updated.
 // export type { ObjectQL as ObjectQLEngine, SchemaRegistry } from '@objectstack/objectql';
 
 // Export ObjectStack spec types for driver development
-export type { DriverInterface, DriverOptions, QueryAST } from '@objectstack/spec';
+import { Data, System } from '@objectstack/spec';
+export type QueryAST = Data.QueryAST;
+export type DriverInterface = System.DriverInterface;
+export type DriverOptions = System.DriverOptions;
 
 // Export our enhanced runtime components (actual implementations)
 export * from './repository';

package/src/plugin.ts

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type { RuntimePlugin, RuntimeContext } from '@objectstack/runtime';
-import type { ObjectStackKernel } from '@objectstack/runtime';
+import type { RuntimePlugin, RuntimeContext } from '@objectql/runtime';
+import type { ObjectStackKernel } from '@objectql/runtime';
 import { ValidatorPlugin, ValidatorPluginConfig } from './validator-plugin';
 import { FormulaPlugin, FormulaPluginConfig } from './formula-plugin';
 import { QueryService } from './query/query-service';
@@ -78,7 +78,7 @@ export interface ObjectQLPluginConfig {
 /**
  * ObjectQL Plugin
  * 
- * Implements the RuntimePlugin interface from @objectstack/runtime
+ * Implements the RuntimePlugin interface from @objectql/runtime
  * to provide ObjectQL's enhanced features (Repository, Validator, Formula, AI)
  * on top of the ObjectStack kernel.
  */
@@ -162,8 +162,53 @@ export class ObjectQLPlugin implements RuntimePlugin {
    * @private
    */
   private async registerRepository(kernel: ObjectStackKernel): Promise<void> {
-    // TODO: Implement repository registration
-    // For now, this is a placeholder to establish the structure
+    if (!this.config.datasources) {
+      console.log(`[${this.name}] No datasources configured, skipping repository registration`);
+      return;
+    }
+
+    const datasources = this.config.datasources;
+
+    // Helper function to get the driver for an object
+    const getDriver = (objectName: string): Driver => {
+      const objectConfig = kernel.metadata.get<any>('object', objectName);
+      const datasourceName = objectConfig?.datasource || 'default';
+      const driver = datasources[datasourceName];
+      if (!driver) {
+        throw new Error(`Datasource '${datasourceName}' not found for object '${objectName}'`);
+      }
+      return driver;
+    };
+
+    // Override kernel CRUD methods to use drivers
+    kernel.create = async (objectName: string, data: any): Promise<any> => {
+      const driver = getDriver(objectName);
+      return await driver.create(objectName, data, {});
+    };
+
+    kernel.update = async (objectName: string, id: string, data: any): Promise<any> => {
+      const driver = getDriver(objectName);
+      return await driver.update(objectName, id, data, {});
+    };
+
+    kernel.delete = async (objectName: string, id: string): Promise<boolean> => {
+      const driver = getDriver(objectName);
+      const result = await driver.delete(objectName, id, {});
+      return !!result;
+    };
+
+    kernel.find = async (objectName: string, query: any): Promise<{ value: any[]; count: number }> => {
+      const driver = getDriver(objectName);
+      const value = await driver.find(objectName, query);
+      const count = value.length;
+      return { value, count };
+    };
+
+    kernel.get = async (objectName: string, id: string): Promise<any> => {
+      const driver = getDriver(objectName);
+      return await driver.findOne(objectName, id);
+    };
+
     console.log(`[${this.name}] Repository pattern registered`);
   }
   

package/src/query/filter-translator.ts

@@ -7,7 +7,8 @@
  */
 
 import type { Filter } from '@objectql/types';
-import type { FilterNode } from '@objectstack/spec';
+import { Data } from '@objectstack/spec';
+type FilterNode = Data.FilterNode;
 import { ObjectQLError } from '@objectql/types';
 
 /**

package/src/query/query-analyzer.ts

@@ -7,7 +7,9 @@
  */
 
 import type { UnifiedQuery, ObjectConfig, MetadataRegistry } from '@objectql/types';
-import type { QueryAST, FilterNode } from '@objectstack/spec';
+import { Data } from '@objectstack/spec';
+type QueryAST = Data.QueryAST;
+type FilterNode = Data.FilterNode;
 import { QueryService, QueryOptions } from './query-service';
 
 /**

package/src/query/query-builder.ts

@@ -7,7 +7,8 @@
  */
 
 import type { UnifiedQuery } from '@objectql/types';
-import type { QueryAST } from '@objectstack/spec';
+import { Data } from '@objectstack/spec';
+type QueryAST = Data.QueryAST;
 import { FilterTranslator } from './filter-translator';
 
 /**

package/src/query/query-service.ts

@@ -13,7 +13,8 @@ import type {
     Filter,
     MetadataRegistry
 } from '@objectql/types';
-import type { QueryAST } from '@objectstack/spec';
+import { Data } from '@objectstack/spec';
+type QueryAST = Data.QueryAST;
 import { QueryBuilder } from './query-builder';
 
 /**

package/src/repository.ts

@@ -7,8 +7,11 @@
  */
 
 import { ObjectQLContext, IObjectQL, ObjectConfig, Driver, UnifiedQuery, ActionContext, HookAPI, RetrievalHookContext, MutationHookContext, UpdateHookContext, ValidationContext, ValidationError, ValidationRuleResult, FormulaContext, Filter } from '@objectql/types';
-import type { ObjectStackKernel } from '@objectstack/runtime';
-import type { QueryAST, FilterNode, SortNode } from '@objectstack/spec';
+import type { ObjectStackKernel } from '@objectql/runtime';
+import { Data } from '@objectstack/spec';
+type QueryAST = Data.QueryAST;
+type FilterNode = Data.FilterNode;
+type SortNode = Data.SortNode;
 import { Validator } from './validator';
 import { FormulaEngine } from './formula-engine';
 import { QueryBuilder } from './query';
@@ -311,6 +314,22 @@ export class ObjectRepository {
     }
 
     async count(filters: any): Promise<number> {
+        // Normalize filters to UnifiedQuery format
+        // If filters is an array, wrap it in a query object
+        // If filters is already a UnifiedQuery (has UnifiedQuery-specific properties), use it as-is
+        let query: UnifiedQuery;
+        if (Array.isArray(filters)) {
+            query = { filters };
+        } else if (filters && typeof filters === 'object' && (filters.fields || filters.sort || filters.limit !== undefined || filters.skip !== undefined)) {
+            // It's already a UnifiedQuery object
+            query = filters;
+        } else if (filters) {
+            // It's a raw filter object, wrap it
+            query = { filters };
+        } else {
+            query = {};
+        }
+
         const hookCtx: RetrievalHookContext = {
             ...this.context,
             objectName: this.objectName,
@@ -318,7 +337,7 @@ export class ObjectRepository {
             api: this.getHookAPI(),
             user: this.getUserFromContext(),
             state: {},
-            query: filters
+            query
         };
         await this.app.triggerHook('beforeCount', this.objectName, hookCtx);
 

package/src/validator-plugin.ts

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type { RuntimePlugin, RuntimeContext, ObjectStackKernel } from '@objectstack/runtime';
+import type { RuntimePlugin, RuntimeContext, ObjectStackKernel } from '@objectql/runtime';
 import { Validator, ValidatorOptions } from './validator';
 
 /**

package/test/__mocks__/@objectstack/runtime.ts

@@ -1,5 +1,5 @@
 /**
- * Mock for @objectstack/runtime
+ * Mock for @objectql/runtime
  * This mock is needed because the npm package has issues with Jest
  * and we want to focus on testing ObjectQL's logic, not the kernel integration.
  * 

package/test/formula-plugin.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { FormulaPlugin } from '../src/formula-plugin';
-import { ObjectStackKernel } from '@objectstack/runtime';
+import { ObjectStackKernel } from '@objectql/runtime';
 
 describe('FormulaPlugin', () => {
     let plugin: FormulaPlugin;

package/test/validator-plugin.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { ValidatorPlugin } from '../src/validator-plugin';
-import { ObjectStackKernel } from '@objectstack/runtime';
+import { ObjectStackKernel } from '@objectql/runtime';
 
 describe('ValidatorPlugin', () => {
     let plugin: ValidatorPlugin;

package/tsconfig.json

@@ -13,7 +13,6 @@
     "../../../node_modules/@objectstack+objectql"
   ],
   "references": [
-    { "path": "../../objectstack/spec" },
     { "path": "../../objectstack/runtime" },
     { "path": "../types" }
   ]