@xata.io/client 0.5.1 → 0.7.1

package/dist/schema/filters.spec.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// Single column with implicit is
+const singleColumnWithImplicitIs = { name: 'r2' };
+// Single column with explicit is
+const singleColumnWithExplicitIs = { name: { $is: 'r2' } };
+// Is string
+const isString = { string: 'string' };
+// Is true
+const isTrue = { boolean: true };
+// Is false
+const isFalse = { boolean: false };
+// Is pos int
+const isPosInt = { number: 1234567 };
+// Is neg int
+const isNegInt = { number: -42 };
+// Is float
+const isFloat = { number: 3.14 };
+//  with dots
+const withDots = { 'settings.plan': 'free' };
+// Nested columns
+const nestedColumns = { settings: { plan: 'free' } };
+// Nested columns array
+const nestedColumnsArray = { settings: [{ dark: false }, { plan: 'free' }] };
+// Nested columns any
+const nestedColumnsAny = { settings: { $any: [{ plan: 'free' }, { plan: 'trial' }] } };
+// Nested columns any value
+const nestedColumnsAnyValue = { settings: { plan: { $any: ['free', 'trial'] } } };
+// Or with $any
+const orWithAny = { 'settings.plan': { $any: ['free', 'paid'] } };
+// Multiple columns implicit and
+const multipleColumnsImplicitAnd = { 'settings.dark': true, 'settings.plan': 'free' };
+// Explicit $all with multi-key filter list
+const explicitAllWithMultiKeyFilterList = {
+    $all: { 'settings.dark': true, 'settings.plan': 'free' }
+};
+// Explicit $all with filter list
+const explicitAllWithFilterList = {
+    $all: [{ 'settings.dark': true }, { 'settings.plan': 'free' }]
+};
+// Explicit $any with multi-key filter list
+const explicitAnyWithMultiKeyFilterList = {
+    $all: { 'settings.dark': true, 'settings.plan': 'free' }
+};
+// Explicit $any with filter list
+const explicitAnyWithFilterList = {
+    $any: [{ 'settings.dark': true }, { 'settings.plan': 'free' }]
+};
+// $any with multiple values
+const anyWithMultipleValues = { number: { $any: [1, 2, 3] } };
+// $none with multiple values
+const noneWithMultipleValues = { number: { $none: [1, 2, 3] } };
+// Exists filter
+const existsFilter = { $exists: 'test' };
+// Not exists filter
+const notExistsFilter = { $notExists: 'test' };
+// Exists with all
+const existsWithAll = { $all: [{ $exists: 'settings' }, { $exists: 'name' }] };
+// Nest any with not
+const nestAnyWithNot = { $not: { $any: { 'settings.dark': true, 'settings.plan': 'free' } } };
+// Mix $all and $any with extra keys
+const mixAllAndAnyWithExtraKeys = {
+    $all: { $any: { 'settings.dark': false, 'settings.plan': 'free' }, name: 'r1' }
+};
+// Range query with less first
+const rangeQueryWithLessFirst = { age: { $lt: 30, $ge: 20 } };
+// Range query with greater first
+const rangeQueryWithGreaterFirst = { age: { $ge: 20, $lt: 30 } };
+// Ordered op
+const orderedOp = { age: { $lt: 30 } };
+// Simple includes
+const simpleIncludes = { labels: { $includes: 'test' } };
+// Simple includes with op
+const simpleIncludesWithOp = { labels: { $includes: { $contains: 'test' } } };
+// Simple includes multiple
+const simpleIncludesMultiple = { labels: { $includes: ['a', 'b', 'c'] } };
+// Simple includes multiple with op
+const simpleIncludesMultipleWithOp = {
+    labels: { $includes: [{ $is: 'a' }, { $is: 'b' }, { $is: 'c' }] }
+};
+// Includes with many comparisons
+const includesWithManyComparisons = {
+    labels: { $includes: { $all: [{ $contains: 'a' }, { $contains: 'b' }] } }
+};
+// Simple includes multiple op and value
+const simpleIncludesMultipleOpAndValue = { labels: { $includes: [{ $contains: 'a' }, 'b'] } };
+// Includes with mode and array of filters
+const includesWithModeAndArrayOfFilters = {
+    labels: { $includesNone: [{ $contains: 'test' }, 'abc', { $endsWith: 'bad' }] }
+};
+// Includes with mix of any and all in predicate position
+const includesWithMixOfAnyAndAllInPredicatePosition = {
+    labels: { $includes: { $any: { $all: [{ $startsWith: 'test' }, { $contains: 'x' }], $any: ['a', 'b'] } } }
+};
+// Simple $includesany
+const simpleIncludesAny = { labels: { $includesAny: 'test' } };
+// Simple $includesall
+const simpleIncludesAll = { labels: { $includesAll: 'test' } };
+// Simple $includesnone
+const simpleIncludesNone = { labels: { $includesNone: 'test' } };
+// Exists value must be string not int
+// @ts-expect-error
+const existsValueMustBeStringNotInt = { $exists: 42 };
+// Exists value must be string not objct
+// @ts-expect-error
+const existsValueMustBeStringNotObject = { $exists: { field: 'settings.unknown' } };
+// Filter by one column
+const filterByOneColumn = { name: 'r1' };
+// Filter with the $is operator
+const filterWithTheIsOperator = { name: { $is: 'r1' } };
+// Filter with dot notation
+const filterWithDotNotation = { 'settings.plan': 'free' };
+// Filter with nested object
+const filterWithNestedObject = { 'settings.plan': { $is: 'free' } };
+// Filter with $any operation
+const filterWithAnyOperation = { 'settings.plan': { $any: ['free', 'paid'] } };
+// Filter with and operations
+const filterWithAndOperations = { 'settings.dark': true, 'settings.plan': 'free' };
+// Filter with both and and any operations
+const filterWithBothAndAndAnyOperations = {
+    $any: { 'settings.dark': true, 'settings.plan': 'free' }
+};
+// Filter with both and and any operations in array
+const filterWithBothAndAndAnyOperationsInArray = { $any: [{ name: 'r1' }, { name: 'r2' }] };
+// Filter with exists operation
+const filterWithExistsOperation = { $exists: 'settings' };
+// Filter with exists, and and any operations
+const filterWithExistsAndAndAnyOperations = {
+    $all: [{ $exists: 'settings' }, { $exists: 'name' }]
+};
+// Filter with not exists operation
+const filterWithNotExistsOperation = { $notExists: 'settings' };
+// Filter with partial match
+const filterWithPartialMatch = { name: { $contains: 'value' } };
+// Filter with pattern operator
+const filterWithPatternOperator = { name: { $pattern: 'value' } };
+// Filter with $startsWith and $endsWith operators
+const filterWithStartsWithAndEndsWithOperators = {
+    name: { $startsWith: 'value', $endsWith: 'value' }
+};
+// Filter with numeric ranges
+const filterWithNumericRanges = { age: { $lt: 30, $ge: 20 } };
+// Filter with negations
+const filterWithNegations = { $not: { name: 'r1' } };
+// Filter with complex negations
+const filterWithComplexNegations = { $not: { $any: [{ name: 'r1' }, { name: 'r2' }] } };
+// Filter with arrays complex negations
+const filterWithArraysComplexNegations = {
+    labels: {
+        $includes: {
+            $all: [{ $contains: 'label' }, { $not: { $endsWith: '-debug' } }]
+        }
+    }
+};
+// Filters with $includesAll
+const filtersWithIncludesAll = {
+    'settings.labels': {
+        $includesAll: [{ $contains: 'label' }]
+    }
+};
+// Filter with invalid property type
+// @ts-expect-error
+const filterWithInvalidPropertyType = { name: 42 };
+// Filter with invalid dot notation property type
+// @ts-expect-error
+const filterWithInvalidNestedPropertyType = { 'settings.plan': 42 };
+// Filter with invalid nested object property type
+// @ts-expect-error
+const filterWithInvalidNestedObjectPropertyType = { settings: { plan: 42 } };
+// Filter with invalid property $is type
+// @ts-expect-error
+const filterWithInvalidOperator = { name: { $is: 42 } };
+test('fake test', () => {
+    // This is a fake test to make sure that the type definitions in this file are working
+});

package/dist/schema/index.d.ts

@@ -1,6 +1,7 @@
 export * from './operators';
 export * from './pagination';
 export { Query } from './query';
+export { isIdentifiable, isXataRecord } from './record';
 export type { Identifiable, XataRecord } from './record';
 export { BaseClient, Repository, RestRepository, RestRespositoryFactory } from './repository';
 export type { XataClientOptions } from './repository';

package/dist/schema/index.js

@@ -14,11 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestRespositoryFactory = exports.RestRepository = exports.Repository = exports.BaseClient = exports.Query = void 0;
+exports.RestRespositoryFactory = exports.RestRepository = exports.Repository = exports.BaseClient = exports.isXataRecord = exports.isIdentifiable = exports.Query = void 0;
 __exportStar(require("./operators"), exports);
 __exportStar(require("./pagination"), exports);
 var query_1 = require("./query");
 Object.defineProperty(exports, "Query", { enumerable: true, get: function () { return query_1.Query; } });
+var record_1 = require("./record");
+Object.defineProperty(exports, "isIdentifiable", { enumerable: true, get: function () { return record_1.isIdentifiable; } });
+Object.defineProperty(exports, "isXataRecord", { enumerable: true, get: function () { return record_1.isXataRecord; } });
 var repository_1 = require("./repository");
 Object.defineProperty(exports, "BaseClient", { enumerable: true, get: function () { return repository_1.BaseClient; } });
 Object.defineProperty(exports, "Repository", { enumerable: true, get: function () { return repository_1.Repository; } });

package/dist/schema/operators.d.ts

@@ -1,72 +1,74 @@
-import { Constraint } from './filters';
-declare type ComparableType = number | Date;
+import { ArrayFilter, ComparableType, ComparableTypeFilter, ExistanceFilter, PropertyFilter, StringTypeFilter } from './filters';
+import { SelectableColumn } from './selection';
 /**
  * Operator to restrict results to only values that are greater than the given value.
  */
-export declare const gt: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const gt: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are greater than or equal to the given value.
  */
-export declare const ge: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const ge: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are greater than or equal to the given value.
  */
-export declare const gte: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const gte: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are lower than the given value.
  */
-export declare const lt: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const lt: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are lower than or equal to the given value.
  */
-export declare const lte: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const lte: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are lower than or equal to the given value.
  */
-export declare const le: <T extends ComparableType>(value: T) => Constraint<T>;
+export declare const le: <T extends ComparableType>(value: T) => ComparableTypeFilter<T>;
 /**
  * Operator to restrict results to only values that are not null.
  */
-export declare const exists: (column: string) => Constraint<string>;
+export declare const exists: <T>(column: SelectableColumn<T, []>) => ExistanceFilter<T>;
 /**
  * Operator to restrict results to only values that are null.
  */
-export declare const notExists: (column: string) => Constraint<string>;
+export declare const notExists: <T>(column: SelectableColumn<T, []>) => ExistanceFilter<T>;
 /**
  * Operator to restrict results to only values that start with the given prefix.
  */
-export declare const startsWith: (value: string) => Constraint<string>;
+export declare const startsWith: (value: string) => StringTypeFilter;
 /**
  * Operator to restrict results to only values that end with the given suffix.
  */
-export declare const endsWith: (value: string) => Constraint<string>;
+export declare const endsWith: (value: string) => StringTypeFilter;
 /**
  * Operator to restrict results to only values that match the given pattern.
  */
-export declare const pattern: (value: string) => Constraint<string>;
+export declare const pattern: (value: string) => StringTypeFilter;
 /**
  * Operator to restrict results to only values that are equal to the given value.
  */
-export declare const is: <T>(value: T) => Constraint<T>;
+export declare const is: <T>(value: T) => PropertyFilter<T>;
 /**
  * Operator to restrict results to only values that are not equal to the given value.
  */
-export declare const isNot: <T>(value: T) => Constraint<T>;
+export declare const isNot: <T>(value: T) => PropertyFilter<T>;
 /**
  * Operator to restrict results to only values that contain the given value.
  */
-export declare const contains: <T>(value: T) => Constraint<T>;
+export declare const contains: (value: string) => StringTypeFilter;
 /**
- * Operator to restrict results to only arrays that include the given value.
+ * Operator to restrict results if some array items match the predicate.
  */
-export declare const includes: (value: string) => Constraint<string>;
+export declare const includes: <T>(value: T) => ArrayFilter<T>;
 /**
- * Operator to restrict results to only arrays that include a value matching the given substring.
+ * Operator to restrict results if all array items match the predicate.
  */
-export declare const includesSubstring: (value: string) => Constraint<string>;
+export declare const includesAll: <T>(value: T) => ArrayFilter<T>;
 /**
- * Operator to restrict results to only arrays that include a value matching the given pattern.
+ * Operator to restrict results if none array items match the predicate.
  */
-export declare const includesPattern: (value: string) => Constraint<string>;
-export declare const includesAll: (value: string) => Constraint<string>;
-export {};
+export declare const includesNone: <T>(value: T) => ArrayFilter<T>;
+/**
+ * Operator to restrict results if some array items match the predicate.
+ */
+export declare const includesAny: <T>(value: T) => ArrayFilter<T>;

package/dist/schema/operators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.includesAll = exports.includesPattern = exports.includesSubstring = exports.includes = exports.contains = exports.isNot = exports.is = exports.pattern = exports.endsWith = exports.startsWith = exports.notExists = exports.exists = exports.le = exports.lte = exports.lt = exports.gte = exports.ge = exports.gt = void 0;
+exports.includesAny = exports.includesNone = exports.includesAll = exports.includes = exports.contains = exports.isNot = exports.is = exports.pattern = exports.endsWith = exports.startsWith = exports.notExists = exports.exists = exports.le = exports.lte = exports.lt = exports.gte = exports.ge = exports.gt = void 0;
 /**
  * Operator to restrict results to only values that are greater than the given value.
  */
@@ -71,21 +71,23 @@ exports.isNot = isNot;
  */
 const contains = (value) => ({ $contains: value });
 exports.contains = contains;
-// TODO: these can only be applied to columns of type "multiple"
 /**
- * Operator to restrict results to only arrays that include the given value.
+ * Operator to restrict results if some array items match the predicate.
  */
 const includes = (value) => ({ $includes: value });
 exports.includes = includes;
 /**
- * Operator to restrict results to only arrays that include a value matching the given substring.
+ * Operator to restrict results if all array items match the predicate.
  */
-const includesSubstring = (value) => ({ $includesSubstring: value });
-exports.includesSubstring = includesSubstring;
-/**
- * Operator to restrict results to only arrays that include a value matching the given pattern.
- */
-const includesPattern = (value) => ({ $includesPattern: value });
-exports.includesPattern = includesPattern;
 const includesAll = (value) => ({ $includesAll: value });
 exports.includesAll = includesAll;
+/**
+ * Operator to restrict results if none array items match the predicate.
+ */
+const includesNone = (value) => ({ $includesNone: value });
+exports.includesNone = includesNone;
+/**
+ * Operator to restrict results if some array items match the predicate.
+ */
+const includesAny = (value) => ({ $includesAny: value });
+exports.includesAny = includesAny;

package/dist/schema/pagination.d.ts

@@ -6,20 +6,20 @@ export declare type PaginationQueryMeta = {
         more: boolean;
     };
 };
-export interface Paginable<T extends XataRecord, R extends XataRecord = T> {
+export interface Paginable<Record extends XataRecord, Result extends XataRecord = Record> {
     meta: PaginationQueryMeta;
-    records: R[];
-    nextPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    previousPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    firstPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    lastPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    records: Result[];
+    nextPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    previousPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    firstPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    lastPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     hasNextPage(): boolean;
 }
 /**
  * A Page contains a set of results from a query plus metadata about the retrieved
  * set of values such as the cursor, required to retrieve additional records.
  */
-export declare class Page<T extends XataRecord, R extends XataRecord = T> implements Paginable<T, R> {
+export declare class Page<Record extends XataRecord, Result extends XataRecord = Record> implements Paginable<Record, Result> {
     #private;
     /**
      * Page metadata, required to retrieve additional records.
@@ -28,36 +28,36 @@ export declare class Page<T extends XataRecord, R extends XataRecord = T> implem
     /**
      * The set of results for this page.
      */
-    readonly records: R[];
-    constructor(query: Query<T, R>, meta: PaginationQueryMeta, records?: R[]);
+    readonly records: Result[];
+    constructor(query: Query<Record, Result>, meta: PaginationQueryMeta, records?: Result[]);
     /**
      * Retrieves the next page of results.
      * @param size Maximum number of results to be retrieved.
      * @param offset Number of results to skip when retrieving the results.
      * @returns The next page or results.
      */
-    nextPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    nextPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     /**
      * Retrieves the previous page of results.
      * @param size Maximum number of results to be retrieved.
      * @param offset Number of results to skip when retrieving the results.
      * @returns The previous page or results.
      */
-    previousPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    previousPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     /**
      * Retrieves the first page of results.
      * @param size Maximum number of results to be retrieved.
      * @param offset Number of results to skip when retrieving the results.
      * @returns The first page or results.
      */
-    firstPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    firstPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     /**
      * Retrieves the last page of results.
      * @param size Maximum number of results to be retrieved.
      * @param offset Number of results to skip when retrieving the results.
      * @returns The last page or results.
      */
-    lastPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    lastPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     /**
      * Shortcut method to check if there will be additional results if the next page of results is retrieved.
      * @returns Whether or not there will be additional results in the next page of results.

package/dist/schema/pagination.js

@@ -77,7 +77,6 @@ class Page {
             return __classPrivateFieldGet(this, _Page_query, "f").getPaginated({ page: { size, offset, last: this.meta.page.cursor } });
         });
     }
-    // TODO: We need to add something on the backend if we want a hasPreviousPage
     /**
      * Shortcut method to check if there will be additional results if the next page of results is retrieved.
      * @returns Whether or not there will be additional results in the next page of results.

package/dist/schema/query.d.ts

@@ -1,56 +1,53 @@
-import { ColumnsFilter, FilterExpression, PageConfig, SortExpression } from '../api/schemas';
-import { DeepConstraint, FilterConstraints, SortDirection, SortFilter } from './filters';
+import { FilterExpression } from '../api/schemas';
+import { NonEmptyArray, RequiredBy } from '../util/types';
+import { Filter } from './filters';
 import { Page, Paginable, PaginationOptions, PaginationQueryMeta } from './pagination';
 import { XataRecord } from './record';
 import { Repository } from './repository';
-import { Select, Selectable, SelectableColumn } from './selection';
+import { SelectableColumn, SelectedPick, ValueAtColumn } from './selection';
+import { SortDirection, SortFilter } from './sorting';
 export declare type QueryOptions<T extends XataRecord> = {
     page?: PaginationOptions;
-    columns?: Extract<keyof Selectable<T>, string>[];
+    columns?: NonEmptyArray<SelectableColumn<T>>;
+    filter?: FilterExpression;
     sort?: SortFilter<T> | SortFilter<T>[];
 };
-export declare type QueryTableOptions = {
-    filter: FilterExpression;
-    sort?: SortExpression;
-    page?: PageConfig;
-    columns?: ColumnsFilter;
-};
 /**
  * Query objects contain the information of all filters, sorting, etc. to be included in the database query.
  *
  * Query objects are immutable. Any method that adds more constraints or options to the query will return
  * a new Query object containing the both the previous and the new constraints and options.
  */
-export declare class Query<T extends XataRecord, R extends XataRecord = T> implements Paginable<T, R> {
+export declare class Query<Record extends XataRecord, Result extends XataRecord = Record> implements Paginable<Record, Result> {
     #private;
     readonly meta: PaginationQueryMeta;
-    readonly records: R[];
-    constructor(repository: Repository<T> | null, table: string, data: Partial<QueryTableOptions>, parent?: Partial<QueryTableOptions>);
-    getQueryOptions(): QueryTableOptions;
+    readonly records: Result[];
+    constructor(repository: Repository<Record> | null, table: string, data: Partial<QueryOptions<Record>>, parent?: Partial<QueryOptions<Record>>);
+    getQueryOptions(): QueryOptions<Record>;
     /**
      * Builds a new query object representing a logical OR between the given subqueries.
      * @param queries An array of subqueries.
      * @returns A new Query object.
      */
-    any(...queries: Query<T, R>[]): Query<T, R>;
+    any(...queries: Query<Record, any>[]): Query<Record, Result>;
     /**
      * Builds a new query object representing a logical AND between the given subqueries.
      * @param queries An array of subqueries.
      * @returns A new Query object.
      */
-    all(...queries: Query<T, R>[]): Query<T, R>;
+    all(...queries: Query<Record, any>[]): Query<Record, Result>;
     /**
      * Builds a new query object representing a logical OR negating each subquery. In pseudo-code: !q1 OR !q2
      * @param queries An array of subqueries.
      * @returns A new Query object.
      */
-    not(...queries: Query<T, R>[]): Query<T, R>;
+    not(...queries: Query<Record, any>[]): Query<Record, Result>;
     /**
      * Builds a new query object representing a logical AND negating each subquery. In pseudo-code: !q1 AND !q2
      * @param queries An array of subqueries.
      * @returns A new Query object.
      */
-    none(...queries: Query<T, R>[]): Query<T, R>;
+    none(...queries: Query<Record, any>[]): Query<Record, Result>;
     /**
      * Builds a new query object adding one or more constraints. Examples:
      *
@@ -64,66 +61,58 @@ export declare class Query<T extends XataRecord, R extends XataRecord = T> imple
      * })
      * ```
      *
-     * @param constraints
      * @returns A new Query object.
      */
-    filter(constraints: FilterConstraints<T>): Query<T, R>;
-    filter<F extends keyof Selectable<T>>(column: F, value: FilterConstraints<T[F]> | DeepConstraint<T[F]>): Query<T, R>;
+    filter(filters: Filter<Record>): Query<Record, Result>;
+    filter<F extends SelectableColumn<Record>>(column: F, value: Filter<ValueAtColumn<Record, F>>): Query<Record, Result>;
     /**
      * Builds a new query with a new sort option.
      * @param column The column name.
      * @param direction The direction. Either ascending or descending.
      * @returns A new Query object.
      */
-    sort<F extends keyof T>(column: F, direction: SortDirection): Query<T, R>;
+    sort<F extends SelectableColumn<Record>>(column: F, direction: SortDirection): Query<Record, Result>;
     /**
      * Builds a new query specifying the set of columns to be returned in the query response.
      * @param columns Array of column names to be returned by the query.
      * @returns A new Query object.
      */
-    select<K extends SelectableColumn<T>>(columns: K[]): Query<T, Select<T, K>>;
-    getPaginated<Options extends QueryOptions<T>>(options?: Options): Promise<Page<T, GetWithColumnOptions<T, R, typeof options>>>;
-    [Symbol.asyncIterator](): AsyncIterableIterator<R>;
-    getIterator<Options extends QueryOptions<T>>(chunk: number, options?: Omit<Options, 'page'>): AsyncGenerator<GetWithColumnOptions<T, R, typeof options>[]>;
+    select<K extends SelectableColumn<Record>>(columns: NonEmptyArray<K>): Query<Record, SelectedPick<Record, NonEmptyArray<K>>>;
+    getPaginated(): Promise<Page<Record, Result>>;
+    getPaginated(options: Omit<QueryOptions<Record>, 'columns'>): Promise<Page<Record, Result>>;
+    getPaginated<Options extends RequiredBy<QueryOptions<Record>, 'columns'>>(options: Options): Promise<Page<Record, SelectedPick<Record, typeof options['columns']>>>;
+    [Symbol.asyncIterator](): AsyncIterableIterator<Result>;
+    getIterator(chunk: number): AsyncGenerator<Result[]>;
+    getIterator(chunk: number, options: Omit<QueryOptions<Record>, 'columns' | 'page'>): AsyncGenerator<Result[]>;
+    getIterator<Options extends RequiredBy<Omit<QueryOptions<Record>, 'page'>, 'columns'>>(chunk: number, options: Options): AsyncGenerator<SelectedPick<Record, typeof options['columns']>[]>;
     /**
      * Performs the query in the database and returns a set of results.
      * @param options Additional options to be used when performing the query.
      * @returns An array of records from the database.
      */
-    getMany<Options extends QueryOptions<T>>(options?: Options): Promise<GetWithColumnOptions<T, R, typeof options>[]>;
+    getMany(): Promise<Result[]>;
+    getMany(options: Omit<QueryOptions<Record>, 'columns'>): Promise<Result[]>;
+    getMany<Options extends RequiredBy<QueryOptions<Record>, 'columns'>>(options: Options): Promise<SelectedPick<Record, typeof options['columns']>[]>;
     /**
      * Performs the query in the database and returns all the results.
      * Warning: If there are a large number of results, this method can have performance implications.
      * @param options Additional options to be used when performing the query.
      * @returns An array of records from the database.
      */
-    getAll<Options extends QueryOptions<T>>(chunk?: number, options?: Omit<Options, 'page'>): Promise<GetWithColumnOptions<T, R, typeof options>[]>;
+    getAll(chunk?: number): Promise<Result[]>;
+    getAll(chunk: number | undefined, options: Omit<QueryOptions<Record>, 'columns' | 'page'>): Promise<Result[]>;
+    getAll<Options extends RequiredBy<Omit<QueryOptions<Record>, 'page'>, 'columns'>>(chunk: number | undefined, options: Options): Promise<SelectedPick<Record, typeof options['columns']>[]>;
     /**
      * Performs the query in the database and returns the first result.
      * @param options Additional options to be used when performing the query.
      * @returns The first record that matches the query, or null if no record matched the query.
      */
-    getOne<Options extends Omit<QueryOptions<T>, 'page'>>(options?: Options): Promise<GetWithColumnOptions<T, R, typeof options> | null>;
-    /**async deleteAll(): Promise<number> {
-      // TODO: Return number of affected rows
-      return 0;
-    }**/
-    nextPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    previousPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    firstPage(size?: number, offset?: number): Promise<Page<T, R>>;
-    lastPage(size?: number, offset?: number): Promise<Page<T, R>>;
+    getOne(): Promise<Result | null>;
+    getOne(options: Omit<QueryOptions<Record>, 'columns' | 'page'>): Promise<Result | null>;
+    getOne<Options extends RequiredBy<Omit<QueryOptions<Record>, 'page'>, 'columns'>>(options: Options): Promise<SelectedPick<Record, typeof options['columns']> | null>;
+    nextPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    previousPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    firstPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
+    lastPage(size?: number, offset?: number): Promise<Page<Record, Result>>;
     hasNextPage(): boolean;
 }
-/**
- * Helper type to read options and compute the correct type for the result values
- * T: Original type
- * R: Default destination type
- * Options: QueryOptions
- *
- * If the columns are overriden in the options, the result type is the pick of the original type and the columns
- * If the columns are not overriden, the result type is the default destination type
- */
-declare type GetWithColumnOptions<T, R, Options> = Options extends {
-    columns: SelectableColumn<T>[];
-} ? Select<T, Options['columns'][number]> : R;
-export {};