@onchaindb/sdk 2.0.1 → 2.1.0

package/src/query-sdk/operators.ts

@@ -202,16 +202,27 @@ export class FieldConditionBuilder {
         return this.cond('b64', value);
     }
 
-    inDataset(dataset: string): LogicalOperator {
-        return this.cond('inDataset', dataset);
+    /** Case-sensitive membership check — use this when exact casing matters. For case-insensitive use .in() */
+    inDataset(values: string[]): LogicalOperator {
+        return this.cond('inDataset', values as any);
     }
 
     inCountry(countryCode: string): LogicalOperator {
         return this.cond('inCountry', countryCode);
     }
 
-    cidr(cidr: string): LogicalOperator {
-        return this.cond('CIDR', cidr);
+    /**
+     * Checks whether the data IP falls within any of the given CIDR ranges.
+     * IMPORTANT: always sends the "$cidr" alias — never the canonical "CIDR" key,
+     * which triggers a stack overflow in Scepter's recursive Operator enum.
+     */
+    cidr(ranges: string | string[]): LogicalOperator {
+        return this.cond('$cidr', (Array.isArray(ranges) ? ranges : [ranges]) as any);
+    }
+
+    /** Matches if the field value contains ANY of the given keywords (case-insensitive substring). */
+    keywords(keywords: string[]): LogicalOperator {
+        return this.cond('keywords', keywords as any);
     }
 
     // ===== CONVENIENCE =====

package/src/query-sdk/tests/FieldConditionBuilder.test.ts

@@ -48,9 +48,11 @@ describe('FieldConditionBuilder', () => {
         test('isLocalIp', () => expect(builder.isLocalIp().toComposable()).toEqual({ field: { isLocalIp: true } }));
         test('isExternalIp', () => expect(builder.isExternalIp().toComposable()).toEqual({ field: { isExternalIp: true } }));
         test('b64', () => expect(builder.b64('dGVzdA==').toComposable()).toEqual({ field: { b64: 'dGVzdA==' } }));
-        test('inDataset', () => expect(builder.inDataset('malware_ips').toComposable()).toEqual({ field: { inDataset: 'malware_ips' } }));
+        test('inDataset', () => expect(builder.inDataset(['admin', 'moderator']).toComposable()).toEqual({ field: { inDataset: ['admin', 'moderator'] } }));
         test('inCountry', () => expect(builder.inCountry('US').toComposable()).toEqual({ field: { inCountry: 'US' } }));
-        test('cidr', () => expect(builder.cidr('192.168.1.0/24').toComposable()).toEqual({ field: { CIDR: '192.168.1.0/24' } }));
+        test('cidr single', () => expect(builder.cidr('192.168.1.0/24').toComposable()).toEqual({ field: { '$cidr': ['192.168.1.0/24'] } }));
+        test('cidr array', () => expect(builder.cidr(['192.168.0.0/16', '10.0.0.0/8']).toComposable()).toEqual({ field: { '$cidr': ['192.168.0.0/16', '10.0.0.0/8'] } }));
+        test('keywords', () => expect(builder.keywords(['rust', 'async']).toComposable()).toEqual({ field: { keywords: ['rust', 'async'] } }));
     });
 
     describe('Dot-notation fields', () => {

package/src/query-sdk/tests/NestedBuilders.test.ts

@@ -171,11 +171,12 @@ describe('NestedFieldConditionBuilder', () => {
     });
 
     describe('Misc operators', () => {
-        test('b64, inCountry, inDataset, cidr', () => {
+        test('b64, inCountry, inDataset, cidr, keywords', () => {
             expect(fieldBuilder.b64('dGVzdA==').condition?.operator).toBe('b64');
             expect(fieldBuilder.inCountry('US').condition?.operator).toBe('inCountry');
-            expect(fieldBuilder.inDataset('malware_ips').condition?.operator).toBe('inDataset');
-            expect(fieldBuilder.cidr('192.168.1.0/24').condition?.operator).toBe('CIDR');
+            expect(fieldBuilder.inDataset(['admin', 'moderator']).condition?.operator).toBe('inDataset');
+            expect(fieldBuilder.cidr('192.168.1.0/24').condition?.operator).toBe('$cidr');
+            expect(fieldBuilder.keywords(['rust', 'async']).condition?.operator).toBe('keywords');
         });
 
         test('IP operators', () => {

package/src/types.ts

@@ -6,7 +6,6 @@ export interface OnDBConfig {
     endpoint: string;
     apiKey?: string; // Deprecated: use appKey instead
     appKey?: string; // App API key for write operations (X-App-Key header)
-    userKey?: string; // User API key for Auto-Pay (X-User-Key header)
     agentKey?: string; // Agent Key with Pay permission (X-Agent-Key header)
     appId?: string; // Application ID for automatic root building
     timeout?: number;
@@ -118,11 +117,6 @@ export interface TaskInfo {
     progress_log: string[];
 }
 
-export interface UserTasksResponse {
-    user_address: string;
-    tasks: TaskInfo[];
-    total_tasks: number;
-}
 
 export interface TransactionStatus {
     id: string;
@@ -140,9 +134,12 @@ export interface QueryRequest {
     limit?: number;
     offset?: number;
     sortBy?: string;
-    sortDirection?: string,
-    find?: QueryValue["find"],
-    select?: QueryValue["select"],
+    sortDirection?: string;
+    find?: QueryValue["find"];
+    select?: QueryValue["select"];
+    field_map?: QueryValue["field_map"];
+    group_by?: QueryValue["group_by"];
+    aggregate?: QueryValue["aggregate"];
 }
 
 // Enhanced query support for advanced query builder
@@ -252,18 +249,28 @@ export class PaymentVerificationError extends OnDBError {
     }
 }
 
-// Index Management
+// Index Management — mirrors CreateIndexRequest from broker (handlers/indexes.rs)
 export interface IndexRequest {
+    name: string;
     collection: string;
-    field: string;
-    type: 'string' | 'number' | 'boolean' | 'date';
+    field_name: string;
+    index_type: 'btree' | 'hash' | 'fulltext' | 'composite' | 'price';
+    store_values?: boolean;
+    unique_constraint?: boolean;
+    sort_enabled?: boolean;
+    /** Write-time payment config — only for index_type: 'price'. */
+    price_config?: import('./database').WriteIndexConfig;
+    /** Read-time payment config. */
+    read_price_config?: import('./database').ReadIndexConfig;
+    /** Creator revenue sharing config. */
+    creator_premium_config?: import('./database').CreatorPremiumConfig;
 }
 
 export interface IndexResponse {
     id: string;
     collection: string;
-    field: string;
-    type: string;
+    field_name: string;
+    index_type: string;
     status: 'active' | 'building' | 'failed';
 }
 
@@ -337,7 +344,9 @@ export interface PricingQuoteRequest {
 export type {
     Index,
     IndexOptions,
-    PriceConfig,
+    WriteIndexConfig,
+    ReadIndexConfig,
+    CreatorPremiumConfig,
 } from './database';
 
 /**
@@ -691,8 +700,8 @@ export interface ViewDataResponse<T = any> {
 }
 
 export interface ViewQueryRequest {
-    find?: any;
-    select?: string[];
+    find?: Record<string, any>;
+    select?: Record<string, boolean>;
     sort_by?: string[];
     limit?: number;
     offset?: number;