@objectql/sdk 4.1.0 → 4.2.1

package/src/index.ts

@@ -1,7 +1,7 @@
-import { Data, System as SystemSpec } from '@objectstack/spec';
-type QueryAST = Data.QueryAST;
-type SortNode = Data.SortNode;
-type DriverInterface = Data.DriverInterface;
+import { Data, System as _SystemSpec } from '@objectstack/spec';
+import { z } from 'zod';
+import { QueryAST } from '@objectql/types';
+type _DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
  * Copyright (c) 2026-present ObjectStack Inc.
@@ -336,7 +336,7 @@ export class RemoteDriver implements Driver {
         try {
             await this.checkHealth();
         } catch (error) {
-            throw new Error(`Failed to connect to remote server: ${(error as Error).message}`);
+            throw new ObjectQLError({ code: 'DRIVER_CONNECTION_FAILED', message: `Failed to connect to remote server: ${(error as Error).message}` });
         }
     }
 
@@ -358,7 +358,7 @@ export class RemoteDriver implements Driver {
                 })
             });
             return res.ok;
-        } catch (error) {
+        } catch (_error) {
             return false;
         }
     }
@@ -389,7 +389,7 @@ export class RemoteDriver implements Driver {
      * });
      * ```
      */
-    async executeQuery(ast: QueryAST, options?: any): Promise<{ value: any[]; count?: number }> {
+    async executeQuery(ast: QueryAST, _options?: any): Promise<{ value: any[]; count?: number }> {
         return this.retryWithBackoff(async () => {
             const endpoint = this.buildEndpoint(this.queryPath);
             this.log('executeQuery', { endpoint, ast });
@@ -478,7 +478,7 @@ export class RemoteDriver implements Driver {
      * });
      * ```
      */
-    async executeCommand(command: Command, options?: any): Promise<CommandResult> {
+    async executeCommand(command: Command, _options?: any): Promise<CommandResult> {
         return this.retryWithBackoff(async () => {
             const endpoint = this.buildEndpoint(this.commandPath);
             this.log('executeCommand', { endpoint, command });
@@ -545,19 +545,19 @@ export class RemoteDriver implements Driver {
      * @example
      * ```typescript
      * // Execute a custom workflow
-     * const result = await driver.execute('/api/workflows/approve', {
+     * const result = await driver.executeCustomEndpoint('/api/workflows/approve', {
      *   workflowId: 'wf_123',
      *   comment: 'Approved'
      * });
      * 
      * // Use default execute endpoint
-     * const result = await driver.execute(undefined, {
+     * const result = await driver.executeCustomEndpoint(undefined, {
      *   action: 'calculateMetrics',
      *   params: { year: 2024 }
      * });
      * ```
      */
-    async execute(endpoint?: string, payload?: any, options?: any): Promise<any> {
+    async executeCustomEndpoint(endpoint?: string, payload?: any, _options?: any): Promise<any> {
         return this.retryWithBackoff(async () => {
             const targetEndpoint = endpoint 
                 ? this.buildEndpoint(endpoint)
@@ -617,7 +617,7 @@ export class RemoteDriver implements Driver {
         const json = await res.json();
         
         if (json.error) {
-            throw new Error(json.error.message);
+            throw new ObjectQLError({ code: 'DRIVER_QUERY_FAILED', message: json.error.message });
         }
         
         return json.data;
@@ -630,40 +630,40 @@ export class RemoteDriver implements Driver {
      * QueryAST format uses 'top' for limit, while UnifiedQuery uses 'limit'.
      * QueryAST sort is array of {field, order}, while UnifiedQuery is array of [field, order].
      */
-    async find(objectName: string, query: any, options?: any): Promise<any[]> {
+    async find(objectName: string, query: any, _options?: any): Promise<any[]> {
         return this.request('find', objectName, query);
     }
 
-    async findOne(objectName: string, id: string | number, query?: any, options?: any): Promise<any> {
+    async findOne(objectName: string, id: string | number, query?: any, _options?: any): Promise<any> {
         return this.request('findOne', objectName, { id, query });
     }
 
-    async create(objectName: string, data: any, options?: any): Promise<any> {
+    async create(objectName: string, data: any, _options?: any): Promise<any> {
         return this.request('create', objectName, data);
     }
 
-    async update(objectName: string, id: string | number, data: any, options?: any): Promise<any> {
+    async update(objectName: string, id: string | number, data: any, _options?: any): Promise<any> {
         // args for update: { id, data } based on server code: repo.update(req.args.id, req.args.data)
         return this.request('update', objectName, { id, data });
     }
 
-    async delete(objectName: string, id: string | number, options?: any): Promise<any> {
+    async delete(objectName: string, id: string | number, _options?: any): Promise<any> {
         return this.request('delete', objectName, { id });
     }
 
-    async count(objectName: string, filters: any, options?: any): Promise<number> {
+    async count(objectName: string, filters: any, _options?: any): Promise<number> {
         return this.request('count', objectName, filters);
     }
 
-    async createMany(objectName: string, data: any[], options?: any): Promise<any> {
+    async createMany(objectName: string, data: any[], _options?: any): Promise<any> {
         return this.request('createMany', objectName, data);
     }
 
-    async updateMany(objectName: string, filters: any, data: any, options?: any): Promise<any> {
+    async updateMany(objectName: string, filters: any, data: any, _options?: any): Promise<any> {
         return this.request('updateMany', objectName, { filters, data });
     }
 
-    async deleteMany(objectName: string, filters: any, options?: any): Promise<any> {
+    async deleteMany(objectName: string, filters: any, _options?: any): Promise<any> {
         return this.request('deleteMany', objectName, { filters });
     }
 }

package/test/remote-driver.test.ts

@@ -7,9 +7,10 @@
  */
 
 import { RemoteDriver } from '../src/index';
+import { vi, Mock } from 'vitest';
 
 // Mock fetch globally
-global.fetch = jest.fn();
+global.fetch = vi.fn();
 
 describe('RemoteDriver', () => {
     let driver: RemoteDriver;
@@ -17,7 +18,7 @@ describe('RemoteDriver', () => {
 
     beforeEach(() => {
         driver = new RemoteDriver(baseUrl);
-        jest.clearAllMocks();
+        vi.clearAllMocks();
     });
 
     describe('Constructor', () => {
@@ -41,7 +42,7 @@ describe('RemoteDriver', () => {
                 ]
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -65,7 +66,7 @@ describe('RemoteDriver', () => {
         it('should handle empty result', async () => {
             const mockResponse = { data: [] };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -78,7 +79,7 @@ describe('RemoteDriver', () => {
                 error: { message: 'Object not found' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -94,7 +95,7 @@ describe('RemoteDriver', () => {
                 data: { _id: '1', name: 'Alice', email: 'alice@example.com' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -116,7 +117,7 @@ describe('RemoteDriver', () => {
         it('should return null when record not found', async () => {
             const mockResponse = { data: null };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -129,7 +130,7 @@ describe('RemoteDriver', () => {
                 data: { _id: 123, name: 'Test' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -156,7 +157,7 @@ describe('RemoteDriver', () => {
                 data: { _id: '3', ...newData }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -181,7 +182,7 @@ describe('RemoteDriver', () => {
                 error: { message: 'Validation failed: email is required' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -198,7 +199,7 @@ describe('RemoteDriver', () => {
                 data: { _id: '1', name: 'Alice Updated', email: 'alice@example.com' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -222,7 +223,7 @@ describe('RemoteDriver', () => {
                 error: { message: 'Record not found' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -236,7 +237,7 @@ describe('RemoteDriver', () => {
                 data: { _id: 123, name: 'Updated' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -259,7 +260,7 @@ describe('RemoteDriver', () => {
         it('should delete a record', async () => {
             const mockResponse = { data: 1 };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -283,7 +284,7 @@ describe('RemoteDriver', () => {
                 error: { message: 'Record not found' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -295,7 +296,7 @@ describe('RemoteDriver', () => {
         it('should handle numeric id in delete', async () => {
             const mockResponse = { data: 1 };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -318,7 +319,7 @@ describe('RemoteDriver', () => {
         it('should count records', async () => {
             const mockResponse = { data: 42 };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -340,7 +341,7 @@ describe('RemoteDriver', () => {
         it('should count all records when no filters', async () => {
             const mockResponse = { data: 100 };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -351,7 +352,7 @@ describe('RemoteDriver', () => {
         it('should return 0 for empty collection', async () => {
             const mockResponse = { data: 0 };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -362,7 +363,7 @@ describe('RemoteDriver', () => {
 
     describe('Error Handling', () => {
         it('should handle network errors', async () => {
-            (global.fetch as jest.Mock).mockRejectedValueOnce(new Error('Network error'));
+            (global.fetch as Mock).mockRejectedValueOnce(new Error('Network error'));
 
             await expect(driver.find('user', {}))
                 .rejects
@@ -370,7 +371,7 @@ describe('RemoteDriver', () => {
         });
 
         it('should handle invalid JSON response', async () => {
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => { throw new Error('Invalid JSON'); }
             });
 
@@ -387,7 +388,7 @@ describe('RemoteDriver', () => {
                 }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -402,7 +403,7 @@ describe('RemoteDriver', () => {
             const driverWithSlash = new RemoteDriver('http://example.com/');
             const mockResponse = { data: [] };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -418,7 +419,7 @@ describe('RemoteDriver', () => {
             const httpsDriver = new RemoteDriver('https://secure.example.com');
             const mockResponse = { data: [] };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -434,7 +435,7 @@ describe('RemoteDriver', () => {
             const customPortDriver = new RemoteDriver('http://localhost:8080');
             const mockResponse = { data: [] };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 json: async () => mockResponse
             });
 
@@ -470,7 +471,7 @@ describe('RemoteDriver', () => {
                 count: 2
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => mockResponse
             });
@@ -502,7 +503,7 @@ describe('RemoteDriver', () => {
                 fields: ['name']
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ value: [], count: 0 })
             });
@@ -524,7 +525,7 @@ describe('RemoteDriver', () => {
             const queryAST = { object: 'users' };
 
             // Test data response format
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ data: [{ id: 1 }] })
             });
@@ -533,7 +534,7 @@ describe('RemoteDriver', () => {
             expect(result.value).toEqual([{ id: 1 }]);
 
             // Test direct array response
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => [{ id: 2 }]
             });
@@ -545,7 +546,7 @@ describe('RemoteDriver', () => {
         it('should handle errors in executeQuery', async () => {
             const queryAST = { object: 'users' };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: false,
                 status: 404,
                 statusText: 'Not Found',
@@ -577,7 +578,7 @@ describe('RemoteDriver', () => {
                 affected: 1
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => mockResponse
             });
@@ -612,7 +613,7 @@ describe('RemoteDriver', () => {
                 affected: 2
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => mockResponse
             });
@@ -630,7 +631,7 @@ describe('RemoteDriver', () => {
                 data: { name: 'Test' }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({
                     error: {
@@ -653,7 +654,7 @@ describe('RemoteDriver', () => {
                 id: '999'
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: false,
                 status: 404,
                 statusText: 'Not Found',
@@ -682,12 +683,12 @@ describe('RemoteDriver', () => {
                 result: { total: 1000 }
             };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => mockResponse
             });
 
-            const result = await driver.execute('/api/custom', payload);
+            const result = await driver.executeCustomEndpoint('/api/custom', payload);
 
             expect(global.fetch).toHaveBeenCalledWith(
                 'http://localhost:3000/api/custom',
@@ -702,12 +703,12 @@ describe('RemoteDriver', () => {
         it('should use default execute endpoint when not specified', async () => {
             const payload = { action: 'test' };
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ success: true })
             });
 
-            await driver.execute(undefined, payload);
+            await driver.executeCustomEndpoint(undefined, payload);
 
             expect(global.fetch).toHaveBeenCalledWith(
                 'http://localhost:3000/api/execute',
@@ -716,7 +717,7 @@ describe('RemoteDriver', () => {
         });
 
         it('should handle errors in execute', async () => {
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: false,
                 status: 500,
                 statusText: 'Internal Server Error',
@@ -728,7 +729,7 @@ describe('RemoteDriver', () => {
                 })
             });
 
-            await expect(driver.execute('/api/test', {}))
+            await expect(driver.executeCustomEndpoint('/api/test', {}))
                 .rejects
                 .toThrow('Server error');
         });
@@ -741,7 +742,7 @@ describe('RemoteDriver', () => {
                 token: 'my-secret-token'
             });
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ value: [], count: 0 })
             });
@@ -764,7 +765,7 @@ describe('RemoteDriver', () => {
                 apiKey: 'my-api-key'
             });
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ value: [], count: 0 })
             });
@@ -788,7 +789,7 @@ describe('RemoteDriver', () => {
                 apiKey: 'my-api-key'
             });
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: true,
                 json: async () => ({ value: [], count: 0 })
             });
@@ -809,11 +810,11 @@ describe('RemoteDriver', () => {
 
     describe('Retry Logic', () => {
         beforeEach(() => {
-            jest.useFakeTimers();
+            vi.useFakeTimers();
         });
 
         afterEach(() => {
-            jest.useRealTimers();
+            vi.useRealTimers();
         });
 
         it('should retry on network errors when enabled', async () => {
@@ -824,7 +825,7 @@ describe('RemoteDriver', () => {
             });
 
             // First two attempts fail, third succeeds
-            (global.fetch as jest.Mock)
+            (global.fetch as Mock)
                 .mockRejectedValueOnce(new Error('Network error'))
                 .mockRejectedValueOnce(new Error('Network error'))
                 .mockResolvedValueOnce({
@@ -835,7 +836,10 @@ describe('RemoteDriver', () => {
             const promise = driverWithRetry.executeQuery({ object: 'users' });
             
             // Fast-forward through retries
-            await jest.runAllTimersAsync();
+            // We need to advance time multiple times for each retry
+            for (let i = 0; i < 2; i++) {
+                await vi.runAllTimersAsync();
+            }
             
             const result = await promise;
 
@@ -850,7 +854,7 @@ describe('RemoteDriver', () => {
                 maxRetries: 3
             });
 
-            (global.fetch as jest.Mock).mockResolvedValueOnce({
+            (global.fetch as Mock).mockResolvedValueOnce({
                 ok: false,
                 status: 400,
                 statusText: 'Bad Request',

package/tsconfig.json

@@ -5,5 +5,6 @@
         "rootDir": "./src"
     },
     "include": ["src/**/*"],
+    "exclude": ["node_modules", "dist", "src/**/*.test.ts"],
     "references": [{ "path": "../../foundation/types" }]
 }