@xata.io/client 0.0.0-beta.2b5cc25 → 0.0.0-beta.343bbfe

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

@@ -1,25 +1,25 @@
-import { XataRecord } from '..';
 import { Query } from './query';
+import { XataRecord } from './record';
 export declare type PaginationQueryMeta = {
     page: {
         cursor: string;
         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,55 +1,53 @@
-import { Repository, XataRecord } from '..';
-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 { Select, Selectable, SelectableColumn } from './selection';
+import { XataRecord } from './record';
+import { Repository } from './repository';
+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:
      *
@@ -63,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 {};

package/dist/schema/query.js

@@ -51,7 +51,7 @@ const pagination_1 = require("./pagination");
  */
 class Query {
     constructor(repository, table, data, parent) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         _Query_table.set(this, void 0);
         _Query_repository.set(this, void 0);
         _Query_data.set(this, { filter: {} });
@@ -65,12 +65,14 @@ class Query {
         else {
             __classPrivateFieldSet(this, _Query_repository, this, "f");
         }
-        __classPrivateFieldGet(this, _Query_data, "f").filter.$any = (_b = (_a = data.filter) === null || _a === void 0 ? void 0 : _a.$any) !== null && _b !== void 0 ? _b : (_c = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _c === void 0 ? void 0 : _c.$any;
-        __classPrivateFieldGet(this, _Query_data, "f").filter.$all = (_e = (_d = data.filter) === null || _d === void 0 ? void 0 : _d.$all) !== null && _e !== void 0 ? _e : (_f = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _f === void 0 ? void 0 : _f.$all;
-        __classPrivateFieldGet(this, _Query_data, "f").filter.$not = (_h = (_g = data.filter) === null || _g === void 0 ? void 0 : _g.$not) !== null && _h !== void 0 ? _h : (_j = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _j === void 0 ? void 0 : _j.$not;
-        __classPrivateFieldGet(this, _Query_data, "f").filter.$none = (_l = (_k = data.filter) === null || _k === void 0 ? void 0 : _k.$none) !== null && _l !== void 0 ? _l : (_m = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _m === void 0 ? void 0 : _m.$none;
-        __classPrivateFieldGet(this, _Query_data, "f").sort = (_o = data.sort) !== null && _o !== void 0 ? _o : parent === null || parent === void 0 ? void 0 : parent.sort;
-        __classPrivateFieldGet(this, _Query_data, "f").columns = (_q = (_p = data.columns) !== null && _p !== void 0 ? _p : parent === null || parent === void 0 ? void 0 : parent.columns) !== null && _q !== void 0 ? _q : ['*'];
+        __classPrivateFieldGet(this, _Query_data, "f").filter = (_b = (_a = data.filter) !== null && _a !== void 0 ? _a : parent === null || parent === void 0 ? void 0 : parent.filter) !== null && _b !== void 0 ? _b : {};
+        __classPrivateFieldGet(this, _Query_data, "f").filter.$any = (_d = (_c = data.filter) === null || _c === void 0 ? void 0 : _c.$any) !== null && _d !== void 0 ? _d : (_e = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _e === void 0 ? void 0 : _e.$any;
+        __classPrivateFieldGet(this, _Query_data, "f").filter.$all = (_g = (_f = data.filter) === null || _f === void 0 ? void 0 : _f.$all) !== null && _g !== void 0 ? _g : (_h = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _h === void 0 ? void 0 : _h.$all;
+        __classPrivateFieldGet(this, _Query_data, "f").filter.$not = (_k = (_j = data.filter) === null || _j === void 0 ? void 0 : _j.$not) !== null && _k !== void 0 ? _k : (_l = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _l === void 0 ? void 0 : _l.$not;
+        __classPrivateFieldGet(this, _Query_data, "f").filter.$none = (_o = (_m = data.filter) === null || _m === void 0 ? void 0 : _m.$none) !== null && _o !== void 0 ? _o : (_p = parent === null || parent === void 0 ? void 0 : parent.filter) === null || _p === void 0 ? void 0 : _p.$none;
+        __classPrivateFieldGet(this, _Query_data, "f").sort = (_q = data.sort) !== null && _q !== void 0 ? _q : parent === null || parent === void 0 ? void 0 : parent.sort;
+        __classPrivateFieldGet(this, _Query_data, "f").columns = (_s = (_r = data.columns) !== null && _r !== void 0 ? _r : parent === null || parent === void 0 ? void 0 : parent.columns) !== null && _s !== void 0 ? _s : ['*'];
+        __classPrivateFieldGet(this, _Query_data, "f").page = (_t = data.page) !== null && _t !== void 0 ? _t : parent === null || parent === void 0 ? void 0 : parent.page;
         this.any = this.any.bind(this);
         this.all = this.all.bind(this);
         this.not = this.not.bind(this);
@@ -89,7 +91,7 @@ class Query {
      * @returns A new Query object.
      */
     any(...queries) {
-        const $any = queries.map((query) => query.getQueryOptions().filter);
+        const $any = queries.map((query) => { var _a; return (_a = query.getQueryOptions().filter) !== null && _a !== void 0 ? _a : {}; });
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $any } }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     /**
@@ -98,7 +100,7 @@ class Query {
      * @returns A new Query object.
      */
     all(...queries) {
-        const $all = queries.map((query) => query.getQueryOptions().filter);
+        const $all = queries.map((query) => { var _a; return (_a = query.getQueryOptions().filter) !== null && _a !== void 0 ? _a : {}; });
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $all } }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     /**
@@ -107,7 +109,7 @@ class Query {
      * @returns A new Query object.
      */
     not(...queries) {
-        const $not = queries.map((query) => query.getQueryOptions().filter);
+        const $not = queries.map((query) => { var _a; return (_a = query.getQueryOptions().filter) !== null && _a !== void 0 ? _a : {}; });
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $not } }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     /**
@@ -116,19 +118,18 @@ class Query {
      * @returns A new Query object.
      */
     none(...queries) {
-        const $none = queries.map((query) => query.getQueryOptions().filter);
+        const $none = queries.map((query) => { var _a; return (_a = query.getQueryOptions().filter) !== null && _a !== void 0 ? _a : {}; });
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $none } }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     filter(a, b) {
+        var _a, _b;
         if (arguments.length === 1) {
             const constraints = Object.entries(a).map(([column, constraint]) => ({ [column]: constraint }));
-            const $all = (0, lang_1.compact)([__classPrivateFieldGet(this, _Query_data, "f").filter.$all].flat().concat(constraints));
+            const $all = (0, lang_1.compact)([(_a = __classPrivateFieldGet(this, _Query_data, "f").filter) === null || _a === void 0 ? void 0 : _a.$all].flat().concat(constraints));
             return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $all } }, __classPrivateFieldGet(this, _Query_data, "f"));
         }
         else {
-            const column = a;
-            const value = b;
-            const $all = (0, lang_1.compact)([__classPrivateFieldGet(this, _Query_data, "f").filter.$all].flat().concat({ [column]: value }));
+            const $all = (0, lang_1.compact)([(_b = __classPrivateFieldGet(this, _Query_data, "f").filter) === null || _b === void 0 ? void 0 : _b.$all].flat().concat([{ [a]: b }]));
             return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { filter: { $all } }, __classPrivateFieldGet(this, _Query_data, "f"));
         }
     }
@@ -139,7 +140,9 @@ class Query {
      * @returns A new Query object.
      */
     sort(column, direction) {
-        const sort = Object.assign(Object.assign({}, __classPrivateFieldGet(this, _Query_data, "f").sort), { [column]: direction });
+        var _a;
+        const originalSort = [(_a = __classPrivateFieldGet(this, _Query_data, "f").sort) !== null && _a !== void 0 ? _a : []].flat();
+        const sort = [...originalSort, { column, direction }];
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { sort }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     /**
@@ -151,7 +154,8 @@ class Query {
         return new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), { columns }, __classPrivateFieldGet(this, _Query_data, "f"));
     }
     getPaginated(options = {}) {
-        return __classPrivateFieldGet(this, _Query_repository, "f").query(this, options);
+        const query = new Query(__classPrivateFieldGet(this, _Query_repository, "f"), __classPrivateFieldGet(this, _Query_table, "f"), options, __classPrivateFieldGet(this, _Query_data, "f"));
+        return __classPrivateFieldGet(this, _Query_repository, "f").query(query);
     }
     [(_Query_table = new WeakMap(), _Query_repository = new WeakMap(), _Query_data = new WeakMap(), Symbol.asyncIterator)]() {
         return __asyncGenerator(this, arguments, function* _a() {
@@ -177,29 +181,20 @@ class Query {
             let end = false;
             while (!end) {
                 const { records, meta } = yield __await(this.getPaginated(Object.assign(Object.assign({}, options), { page: { size: chunk, offset } })));
+                // Method overloading does not provide type inference for the return type.
                 yield yield __await(records);
                 offset += chunk;
                 end = !meta.page.more;
             }
         });
     }
-    /**
-     * 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 = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const { records } = yield this.getPaginated(options);
+            // Method overloading does not provide type inference for the return type.
             return records;
         });
     }
-    /**
-     * 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(chunk = pagination_1.PAGINATION_MAX_SIZE, options = {}) {
         var e_2, _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -217,24 +212,17 @@ class Query {
                 }
                 finally { if (e_2) throw e_2.error; }
             }
+            // Method overloading does not provide type inference for the return type.
             return results;
         });
     }
-    /**
-     * 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 = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const records = yield this.getMany(Object.assign(Object.assign({}, options), { page: { size: 1 } }));
+            // Method overloading does not provide type inference for the return type.
             return records[0] || null;
         });
     }
-    /**async deleteAll(): Promise<number> {
-      // TODO: Return number of affected rows
-      return 0;
-    }**/
     nextPage(size, offset) {
         return this.firstPage(size, offset);
     }

package/dist/schema/record.d.ts

@@ -1,4 +1,4 @@
-import { Selectable } from './selection';
+import { SelectedPick } from './selection';
 /**
  * Represents an identifiable record from the database.
  */
@@ -8,6 +8,9 @@ export interface Identifiable {
      */
     id: string;
 }
+export interface BaseData {
+    [key: string]: any;
+}
 /**
  * Represents a persisted record from the database.
  */
@@ -24,14 +27,14 @@ export interface XataRecord extends Identifiable {
     /**
      * Retrieves a refreshed copy of the current record from the database.
      */
-    read(): Promise<this>;
+    read(): Promise<Readonly<SelectedPick<this, ['*']>> | null>;
     /**
      * Performs a partial update of the current record. On success a new object is
      * returned and the current object is not mutated.
      * @param data The columns and their values that have to be updated.
      * @returns A new record containing the latest values for all the columns of the current record.
      */
-    update(data: Partial<Selectable<this>>): Promise<this>;
+    update(partialUpdate: Partial<EditableData<Omit<this, keyof XataRecord>>>): Promise<Readonly<SelectedPick<this, ['*']>>>;
     /**
      * Performs a deletion of the current record in the database.
      *
@@ -39,3 +42,25 @@ export interface XataRecord extends Identifiable {
      */
     delete(): Promise<void>;
 }
+export declare type Link<Record extends XataRecord> = Omit<XataRecord, 'read' | 'update'> & {
+    /**
+     * Retrieves a refreshed copy of the current record from the database.
+     */
+    read(): Promise<Readonly<SelectedPick<Record, ['*']>> | null>;
+    /**
+     * Performs a partial update of the current record. On success a new object is
+     * returned and the current object is not mutated.
+     * @param data The columns and their values that have to be updated.
+     * @returns A new record containing the latest values for all the columns of the current record.
+     */
+    update(partialUpdate: Partial<EditableData<Omit<Record, keyof XataRecord>>>): Promise<Readonly<SelectedPick<Record, ['*']>>>;
+};
+export declare function isIdentifiable(x: any): x is Identifiable & Record<string, unknown>;
+export declare function isXataRecord(x: any): x is XataRecord & Record<string, unknown>;
+export declare type EditableData<O extends BaseData> = {
+    [K in keyof O]: O[K] extends XataRecord ? {
+        id: string;
+    } : NonNullable<O[K]> extends XataRecord ? {
+        id: string;
+    } | null | undefined : O[K];
+};

package/dist/schema/record.js

@@ -1,2 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isXataRecord = exports.isIdentifiable = void 0;
+const lang_1 = require("../util/lang");
+function isIdentifiable(x) {
+    return (0, lang_1.isObject)(x) && (0, lang_1.isString)(x === null || x === void 0 ? void 0 : x.id);
+}
+exports.isIdentifiable = isIdentifiable;
+function isXataRecord(x) {
+    var _a;
+    return (isIdentifiable(x) && typeof (x === null || x === void 0 ? void 0 : x.xata) === 'object' && typeof ((_a = x === null || x === void 0 ? void 0 : x.xata) === null || _a === void 0 ? void 0 : _a.version) === 'number');
+}
+exports.isXataRecord = isXataRecord;