@onchaindb/sdk 2.0.0 → 2.1.0

package/dist/query-sdk/QueryBuilder.d.ts

@@ -2,7 +2,7 @@ import { QueryRequest, QueryResponse, SelectionMap, Val } from '../index';
 import { LogicalOperator } from './operators';
 import { SelectionBuilder } from './SelectionBuilder';
 import { ConditionBuilder } from './ConditionBuilder';
-import { FieldMap, HttpClient } from "./index";
+import { FieldMap, HttpClient, AggregateSpec } from "./index";
 export interface ServerJoinConfig {
     alias: string;
     model: string;
@@ -12,19 +12,13 @@ export interface ServerJoinConfig {
         select?: SelectionMap;
     };
 }
-export interface JoinConfig {
-    parentCollection: string;
-    parentField: string;
-    childField: string;
-    alias: string;
-}
 export declare class QueryBuilder {
     private findConditions?;
     private selections?;
     private fieldMap?;
     private limitValue?;
     private offsetValue?;
-    private sortBy?;
+    private _sortField?;
     private sortDirection?;
     private includeHistoryValue?;
     private httpClient?;
@@ -32,7 +26,8 @@ export declare class QueryBuilder {
     private collectionName;
     private app;
     private serverJoinConfigs;
-    private joinConfigs;
+    private _groupBy?;
+    private _aggregate?;
     constructor(httpClient?: HttpClient, serverUrl?: string, app?: string);
     static new(httpClient?: HttpClient, serverUrl?: string, app?: string): QueryBuilder;
     withHttpClient(httpClient: HttpClient): QueryBuilder;
@@ -47,14 +42,16 @@ export declare class QueryBuilder {
     joinWith(alias: string, model: string): JoinBuilder;
     joinOne(alias: string, model: string): JoinBuilder;
     joinMany(alias: string, model: string): JoinBuilder;
-    join(parentCollection: string, parentField: string, childField: string, alias: string): QueryBuilder;
     select(builderFn: (builder: SelectionBuilder) => SelectionBuilder): QueryBuilder;
     selectFields(fields: string[]): QueryBuilder;
     selectAll(): QueryBuilder;
     withFieldMap(fieldMap: FieldMap): QueryBuilder;
     limit(limit: number): QueryBuilder;
+    take(n: number): QueryBuilder;
     offset(offset: number): QueryBuilder;
-    orderBy(fields: string, direction?: "ASC" | "DESC"): QueryBuilder;
+    skip(n: number): QueryBuilder;
+    sortBy(field: string, direction?: "asc" | "desc" | "ASC" | "DESC"): QueryBuilder;
+    orderBy(field: string, direction?: "ASC" | "DESC"): QueryBuilder;
     includeHistory(include?: boolean): QueryBuilder;
     execute<T extends Record<string, any>>(): Promise<QueryResponse<T>>;
     executeUnique<T extends Record<string, any>>(): Promise<T | null>;
@@ -65,6 +62,7 @@ export declare class QueryBuilder {
     minBy<T = any>(field: string): Promise<T | null>;
     distinctBy<T = any>(field: string): Promise<T[]>;
     countDistinct(field: string): Promise<number>;
+    runAggregate(spec: AggregateSpec): Promise<Record<string, any>>;
     groupBy(field: string): GroupByQueryBuilder;
     executeWithPayment<T extends Record<string, any>>(quoteId: string, paymentProof: string, network?: string): Promise<QueryResponse<T>>;
     getQueryRequest(): QueryRequest;
@@ -72,8 +70,10 @@ export declare class QueryBuilder {
     buildRawQuery(): QueryRequest;
     clone(): QueryBuilder;
     _addServerJoin(config: ServerJoinConfig): void;
+    _setSelections(select: SelectionMap): this;
+    _setGroupBy(fields: string[]): this;
+    _setAggregate(agg: AggregateSpec): this;
     private executeSimpleQuery;
-    private executeWithJoins;
     private buildQueryValue;
 }
 export declare class WhereClause {
@@ -103,9 +103,10 @@ export declare class WhereClause {
     isLocalIp(): QueryBuilder;
     isExternalIp(): QueryBuilder;
     b64(value: string): QueryBuilder;
-    inDataset(dataset: string): QueryBuilder;
+    inDataset(values: string[]): QueryBuilder;
     inCountry(countryCode: string): QueryBuilder;
-    cidr(cidr: string): QueryBuilder;
+    cidr(ranges: string | string[]): QueryBuilder;
+    keywords(keywords: string[]): QueryBuilder;
     between(min: any, max: any): QueryBuilder;
     isTrue(): QueryBuilder;
     isFalse(): QueryBuilder;
@@ -152,6 +153,7 @@ export declare class GroupByQueryBuilder {
     avgBy(field: string): Promise<Record<string, number>>;
     maxBy<T = any>(field: string): Promise<Record<string, T>>;
     minBy<T = any>(field: string): Promise<Record<string, T>>;
-    private getGroupKey;
+    run(spec: AggregateSpec): Promise<Record<string, any>[]>;
+    private buildGroupMap;
 }
 //# sourceMappingURL=QueryBuilder.d.ts.map

package/dist/query-sdk/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../src/query-sdk/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../src/query-sdk/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/dist/query-sdk/QueryBuilder.js

@@ -9,7 +9,6 @@ const x402_1 = require("../x402");
 class QueryBuilder {
     constructor(httpClient, serverUrl, app) {
         this.serverJoinConfigs = [];
-        this.joinConfigs = [];
         this.httpClient = httpClient;
         this.serverUrl = serverUrl;
         this.app = app;
@@ -55,16 +54,6 @@ class QueryBuilder {
     joinMany(alias, model) {
         return new JoinBuilder(this, alias, model, true);
     }
-    join(parentCollection, parentField, childField, alias) {
-        console.warn('QueryBuilder.join() is deprecated. Use serverJoin(), joinOne(), or joinMany() for server-side JOINs.');
-        this.joinConfigs.push({
-            parentCollection,
-            parentField,
-            childField,
-            alias
-        });
-        return this;
-    }
     select(builderFn) {
         const selectionBuilder = new SelectionBuilder_1.SelectionBuilder();
         builderFn(selectionBuilder);
@@ -89,24 +78,21 @@ class QueryBuilder {
         this.limitValue = limit;
         return this;
     }
+    take(n) { return this.limit(n); }
     offset(offset) {
         this.offsetValue = offset;
         return this;
     }
-    orderBy(fields, direction) {
-        this.sortBy = fields;
-        switch (direction) {
-            case "ASC":
-                this.sortDirection = "ascending";
-                break;
-            case "DESC":
-                this.sortDirection = "descending";
-                break;
-            default:
-                this.sortDirection = "ascending";
-        }
+    skip(n) { return this.offset(n); }
+    sortBy(field, direction) {
+        this._sortField = field;
+        const dir = direction?.toLowerCase();
+        this.sortDirection = dir === "desc" ? "descending" : "ascending";
         return this;
     }
+    orderBy(field, direction) {
+        return this.sortBy(field, direction);
+    }
     includeHistory(include = true) {
         this.includeHistoryValue = include;
         return this;
@@ -118,13 +104,6 @@ class QueryBuilder {
         if (!this.serverUrl) {
             throw new Error('Server URL is required for query execution');
         }
-        if (this.serverJoinConfigs.length > 0) {
-            return this.executeSimpleQuery();
-        }
-        if (this.joinConfigs.length > 0) {
-            console.warn('Using deprecated client-side JOINs. Consider migrating to serverJoin() for better performance.');
-            return this.executeWithJoins();
-        }
         return this.executeSimpleQuery();
     }
     async executeUnique() {
@@ -150,49 +129,44 @@ class QueryBuilder {
         return sortedRecords[0];
     }
     async count() {
-        const response = await this.execute();
-        return response.records?.length || 0;
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _count: { '$count': '*' } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._count ?? 0;
     }
     async sumBy(field) {
-        const response = await this.execute();
-        if (!response.records)
-            return 0;
-        return response.records.reduce((sum, record) => {
-            const value = record[field];
-            return sum + (typeof value === 'number' ? value : 0);
-        }, 0);
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$sum': field } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._result ?? 0;
     }
     async avgBy(field) {
-        const response = await this.execute();
-        if (!response.records || response.records.length === 0)
-            return 0;
-        const sum = response.records.reduce((total, record) => {
-            const value = record[field];
-            return total + (typeof value === 'number' ? value : 0);
-        }, 0);
-        return sum / response.records.length;
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$avg': field } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._result ?? 0;
     }
     async maxBy(field) {
-        const response = await this.execute();
-        if (!response.records || response.records.length === 0)
-            return null;
-        return response.records.reduce((max, record) => {
-            const value = record[field];
-            if (max === null)
-                return value;
-            return value > max ? value : max;
-        }, null);
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$max': field } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._result ?? null;
     }
     async minBy(field) {
-        const response = await this.execute();
-        if (!response.records || response.records.length === 0)
-            return null;
-        return response.records.reduce((min, record) => {
-            const value = record[field];
-            if (min === null)
-                return value;
-            return value < min ? value : min;
-        }, null);
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$min': field } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._result ?? null;
     }
     async distinctBy(field) {
         const response = await this.execute();
@@ -208,8 +182,19 @@ class QueryBuilder {
         return Array.from(uniqueValues);
     }
     async countDistinct(field) {
-        const distinctValues = await this.distinctBy(field);
-        return distinctValues.length;
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$countDistinct': field } });
+        const response = await clone.execute();
+        const first = response.records?.[0];
+        return first?._result ?? 0;
+    }
+    async runAggregate(spec) {
+        const clone = this.clone();
+        clone._setSelections({});
+        clone._setAggregate(spec);
+        const response = await clone.execute();
+        return response.records?.[0] ?? {};
     }
     groupBy(field) {
         return new GroupByQueryBuilder(this, field);
@@ -259,7 +244,7 @@ class QueryBuilder {
             ...queryValue,
             limit: this.limitValue,
             offset: this.offsetValue,
-            sortBy: this.sortBy,
+            sortBy: this._sortField,
             sortDirection: this.sortDirection,
             root: `${this.app}::${this.collectionName}`
         };
@@ -272,7 +257,7 @@ class QueryBuilder {
             ...this.buildQueryValue(),
             limit: this.limitValue,
             offset: this.offsetValue,
-            sortBy: this.sortBy,
+            sortBy: this._sortField,
             sortDirection: this.sortDirection,
         };
     }
@@ -283,17 +268,30 @@ class QueryBuilder {
         cloned.fieldMap = this.fieldMap ? { ...this.fieldMap } : undefined;
         cloned.limitValue = this.limitValue;
         cloned.offsetValue = this.offsetValue;
-        cloned.sortBy = this.sortBy;
+        cloned._sortField = this._sortField;
         cloned.sortDirection = this.sortDirection;
         cloned.includeHistoryValue = this.includeHistoryValue;
         cloned.collectionName = this.collectionName;
         cloned.serverJoinConfigs = [...this.serverJoinConfigs];
-        cloned.joinConfigs = [...this.joinConfigs];
+        cloned._groupBy = this._groupBy ? [...this._groupBy] : undefined;
+        cloned._aggregate = this._aggregate ? { ...this._aggregate } : undefined;
         return cloned;
     }
     _addServerJoin(config) {
         this.serverJoinConfigs.push(config);
     }
+    _setSelections(select) {
+        this.selections = select;
+        return this;
+    }
+    _setGroupBy(fields) {
+        this._groupBy = fields;
+        return this;
+    }
+    _setAggregate(agg) {
+        this._aggregate = agg;
+        return this;
+    }
     async executeSimpleQuery() {
         const request = this.getQueryRequest();
         try {
@@ -329,52 +327,6 @@ class QueryBuilder {
             throw new Error(`Query execution failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }
-    async executeWithJoins() {
-        const mainQuery = this.clone();
-        mainQuery.joinConfigs = [];
-        const mainResults = await mainQuery.executeSimpleQuery();
-        if (mainResults.records.length === 0) {
-            return mainResults;
-        }
-        const joinResults = {};
-        for (const joinConfig of this.joinConfigs) {
-            const joinKeys = [...new Set(mainResults.records
-                    .map(record => record[joinConfig.childField])
-                    .filter(key => key !== null && key !== undefined))];
-            if (joinKeys.length > 0) {
-                const joinQuery = new QueryBuilder(this.httpClient, this.serverUrl, this.app);
-                const joinResponse = await joinQuery
-                    .collection(joinConfig.parentCollection)
-                    .whereField(joinConfig.parentField).in(joinKeys)
-                    .selectAll()
-                    .executeSimpleQuery();
-                joinResults[joinConfig.alias] = joinResponse.records;
-            }
-            else {
-                joinResults[joinConfig.alias] = [];
-            }
-        }
-        const mergedRecords = mainResults.records.map(mainRecord => {
-            const merged = { ...mainRecord };
-            for (const joinConfig of this.joinConfigs) {
-                const joinKey = mainRecord[joinConfig.childField];
-                const relatedRecords = joinResults[joinConfig.alias].filter(joinRecord => joinRecord[joinConfig.parentField] === joinKey);
-                if (joinConfig.parentCollection === this.collectionName) {
-                    merged[joinConfig.alias] = relatedRecords;
-                }
-                else {
-                    merged[joinConfig.alias] = relatedRecords.length > 0 ? relatedRecords[0] : null;
-                }
-            }
-            return merged;
-        });
-        return {
-            records: mergedRecords,
-            limit: mainResults.limit,
-            page: mainResults.page,
-            total: mainResults.total
-        };
-    }
     buildQueryValue() {
         let find = this.findConditions ? this.findConditions.toComposable() : {};
         const select = this.selections || SelectionBuilder_1.SelectionBuilder.all();
@@ -397,6 +349,15 @@ class QueryBuilder {
         if (this.includeHistoryValue !== undefined) {
             queryValue.include_history = this.includeHistoryValue;
         }
+        if (this.fieldMap && Object.keys(this.fieldMap).length > 0) {
+            queryValue.field_map = this.fieldMap;
+        }
+        if (this._groupBy && this._groupBy.length > 0) {
+            queryValue.group_by = this._groupBy;
+        }
+        if (this._aggregate && Object.keys(this._aggregate).length > 0) {
+            queryValue.aggregate = this._aggregate;
+        }
         return queryValue;
     }
 }
@@ -432,9 +393,10 @@ class WhereClause {
     isLocalIp() { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).isLocalIp()); }
     isExternalIp() { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).isExternalIp()); }
     b64(value) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).b64(value)); }
-    inDataset(dataset) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).inDataset(dataset)); }
+    inDataset(values) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).inDataset(values)); }
     inCountry(countryCode) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).inCountry(countryCode)); }
-    cidr(cidr) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).cidr(cidr)); }
+    cidr(ranges) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).cidr(ranges)); }
+    keywords(keywords) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).keywords(keywords)); }
     between(min, max) { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).between(min, max)); }
     isTrue() { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).isTrue()); }
     isFalse() { return this.set(new operators_1.FieldConditionBuilder(this.fieldName).isFalse()); }
@@ -541,86 +503,60 @@ class GroupByQueryBuilder {
         this.groupByField = groupByField;
     }
     async count() {
-        const response = await this.queryBuilder.execute();
-        if (!response.records)
-            return {};
-        const groups = {};
-        for (const record of response.records) {
-            const key = this.getGroupKey(record);
-            groups[key] = (groups[key] || 0) + 1;
-        }
-        return groups;
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate({ _count: { '$count': '*' } });
+        const response = await clone.execute();
+        return this.buildGroupMap(response.records, '_count');
     }
     async sumBy(field) {
-        const response = await this.queryBuilder.execute();
-        if (!response.records)
-            return {};
-        const groups = {};
-        for (const record of response.records) {
-            const key = this.getGroupKey(record);
-            const value = record[field];
-            groups[key] = (groups[key] || 0) + (typeof value === 'number' ? value : 0);
-        }
-        return groups;
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$sum': field } });
+        const response = await clone.execute();
+        return this.buildGroupMap(response.records, '_result');
     }
     async avgBy(field) {
-        const response = await this.queryBuilder.execute();
-        if (!response.records)
-            return {};
-        const groups = {};
-        for (const record of response.records) {
-            const key = this.getGroupKey(record);
-            const value = record[field];
-            if (!groups[key]) {
-                groups[key] = { sum: 0, count: 0 };
-            }
-            groups[key].sum += typeof value === 'number' ? value : 0;
-            groups[key].count += 1;
-        }
-        const result = {};
-        for (const [key, { sum, count }] of Object.entries(groups)) {
-            result[key] = count > 0 ? sum / count : 0;
-        }
-        return result;
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$avg': field } });
+        const response = await clone.execute();
+        return this.buildGroupMap(response.records, '_result');
     }
     async maxBy(field) {
-        const response = await this.queryBuilder.execute();
-        if (!response.records)
-            return {};
-        const groups = {};
-        for (const record of response.records) {
-            const key = this.getGroupKey(record);
-            const value = record[field];
-            if (!(key in groups) || value > groups[key]) {
-                groups[key] = value;
-            }
-        }
-        return groups;
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$max': field } });
+        const response = await clone.execute();
+        return this.buildGroupMap(response.records, '_result');
     }
     async minBy(field) {
-        const response = await this.queryBuilder.execute();
-        if (!response.records)
-            return {};
-        const groups = {};
-        for (const record of response.records) {
-            const key = this.getGroupKey(record);
-            const value = record[field];
-            if (!(key in groups) || value < groups[key]) {
-                groups[key] = value;
-            }
-        }
-        return groups;
-    }
-    getGroupKey(record) {
-        if (this.groupByField.includes('.')) {
-            const parts = this.groupByField.split('.');
-            let current = record;
-            for (const part of parts) {
-                current = current?.[part];
-            }
-            return String(current ?? 'null');
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate({ _result: { '$min': field } });
+        const response = await clone.execute();
+        return this.buildGroupMap(response.records, '_result');
+    }
+    async run(spec) {
+        const clone = this.queryBuilder.clone();
+        clone._setGroupBy([this.groupByField]);
+        clone._setSelections({});
+        clone._setAggregate(spec);
+        const response = await clone.execute();
+        return response.records ?? [];
+    }
+    buildGroupMap(records, aggKey) {
+        const result = {};
+        for (const record of records ?? []) {
+            const key = String(record[this.groupByField] ?? 'null');
+            result[key] = record[aggKey];
         }
-        return String(record[this.groupByField] ?? 'null');
+        return result;
     }
 }
 exports.GroupByQueryBuilder = GroupByQueryBuilder;