@xata.io/client 0.1.0 → 0.1.4

package/README.md

@@ -0,0 +1 @@
+Visit https://github.com/xataio/client-ts for more information.

package/dist/index.d.ts

@@ -23,25 +23,32 @@ export declare type Include<T> = {
     [key in keyof T as T[key] extends XataRecord ? key : never]?: boolean | Array<keyof Selectable<T[key]>>;
 };
 declare type SortDirection = 'asc' | 'desc';
-declare type Operator = '_gt' | '_lt' | '_gte' | '_lte' | '_exists' | '_notExists' | '_endsWith' | '_startsWith' | '_pattern' | '_isNot' | '_includes' | '_includesSubstring' | '_includesPattern' | '_includesAll';
+declare type Operator = '$gt' | '$lt' | '$ge' | '$le' | '$exists' | '$notExists' | '$endsWith' | '$startsWith' | '$pattern' | '$is' | '$isNot' | '$contains' | '$includes' | '$includesSubstring' | '$includesPattern' | '$includesAll';
 declare type Constraint<T> = Partial<Record<Operator, T>>;
+declare type DeepConstraint<T> = T extends Record<string, any> ? {
+    [key in keyof T]?: T[key] | DeepConstraint<T[key]>;
+} : Constraint<T>;
 declare type ComparableType = number | Date;
 export declare const gt: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
+export declare const ge: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
 export declare const gte: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
 export declare const lt: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
 export declare const lte: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
+export declare const le: <T extends ComparableType>(value: T) => Partial<Record<Operator, T>>;
 export declare const exists: (column: string) => Constraint<string>;
 export declare const notExists: (column: string) => Constraint<string>;
 export declare const startsWith: (value: string) => Constraint<string>;
 export declare const endsWith: (value: string) => Constraint<string>;
 export declare const pattern: (value: string) => Constraint<string>;
+export declare const is: <T>(value: T) => Partial<Record<Operator, T>>;
 export declare const isNot: <T>(value: T) => Partial<Record<Operator, T>>;
+export declare const contains: <T>(value: T) => Partial<Record<Operator, T>>;
 export declare const includes: (value: string) => Constraint<string>;
 export declare const includesSubstring: (value: string) => Constraint<string>;
 export declare const includesPattern: (value: string) => Constraint<string>;
 export declare const includesAll: (value: string) => Constraint<string>;
 declare type FilterConstraints<T> = {
-    [key in keyof T]?: T[key] extends Record<string, any> ? FilterConstraints<T[key]> : T[key] | Constraint<T[key]>;
+    [key in keyof T]?: T[key] extends Record<string, any> ? FilterConstraints<T[key]> : T[key] | DeepConstraint<T[key]>;
 };
 declare type BulkQueryOptions<T> = {
     filter?: FilterConstraints<T>;
@@ -54,32 +61,23 @@ declare type QueryOrConstraint<T, R> = Query<T, R> | Constraint<T>;
 export declare class Query<T, R = T> {
     table: string;
     repository: Repository<T>;
-    readonly _any?: QueryOrConstraint<T, R>[];
-    readonly _all?: QueryOrConstraint<T, R>[];
-    readonly _not?: QueryOrConstraint<T, R>[];
-    readonly _none?: QueryOrConstraint<T, R>[];
-    readonly _sort?: Record<string, SortDirection>;
+    readonly $any?: QueryOrConstraint<T, R>[];
+    readonly $all?: QueryOrConstraint<T, R>[];
+    readonly $not?: QueryOrConstraint<T, R>[];
+    readonly $none?: QueryOrConstraint<T, R>[];
+    readonly $sort?: Record<string, SortDirection>;
     constructor(repository: Repository<T> | null, table: string, data: Partial<Query<T, R>>, parent?: Query<T, R>);
     any(...queries: Query<T, R>[]): Query<T, R>;
     all(...queries: Query<T, R>[]): Query<T, R>;
     not(...queries: Query<T, R>[]): Query<T, R>;
     none(...queries: Query<T, R>[]): Query<T, R>;
     filter(constraints: FilterConstraints<T>): Query<T, R>;
-    filter<F extends keyof T>(column: F, value: FilterConstraints<T[F]> | Constraint<T[F]>): Query<T, R>;
+    filter<F extends keyof T>(column: F, value: FilterConstraints<T[F]> | DeepConstraint<T[F]>): Query<T, R>;
     sort<F extends keyof T>(column: F, direction: SortDirection): Query<T, R>;
     getMany(options?: BulkQueryOptions<T>): Promise<R[]>;
     getOne(options?: BulkQueryOptions<T>): Promise<R | null>;
     deleteAll(): Promise<number>;
     include(columns: Include<T>): this;
-    toJSON(): {
-        _filter: {
-            _any: QueryOrConstraint<T, R>[] | undefined;
-            _all: QueryOrConstraint<T, R>[] | undefined;
-            _not: QueryOrConstraint<T, R>[] | undefined;
-            _none: QueryOrConstraint<T, R>[] | undefined;
-        } | undefined;
-        _sort: Record<string, SortDirection> | undefined;
-    };
 }
 export declare abstract class Repository<T> extends Query<T, Selectable<T>> {
     select<K extends keyof Selectable<T>>(...columns: K[]): Query<T, Select<T, K>>;
@@ -109,8 +107,8 @@ export declare class RestRespositoryFactory implements RepositoryFactory {
 }
 export declare type XataClientOptions = {
     fetch?: unknown;
-    url: string;
-    token: string;
+    databaseURL: string;
+    apiKey: string;
     repositoryFactory?: RepositoryFactory;
 };
 export declare class BaseClient<D extends Record<string, Repository<any>>> {

package/dist/index.js

@@ -9,35 +9,43 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XataError = exports.BaseClient = exports.RestRespositoryFactory = exports.RestRepository = exports.Repository = exports.Query = exports.includesAll = exports.includesPattern = exports.includesSubstring = exports.includes = exports.isNot = exports.pattern = exports.endsWith = exports.startsWith = exports.notExists = exports.exists = exports.lte = exports.lt = exports.gte = exports.gt = void 0;
-const gt = (value) => ({ _gt: value });
+exports.XataError = exports.BaseClient = exports.RestRespositoryFactory = exports.RestRepository = exports.Repository = exports.Query = 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;
+const gt = (value) => ({ $gt: value });
 exports.gt = gt;
-const gte = (value) => ({ _gte: value });
+const ge = (value) => ({ $ge: value });
+exports.ge = ge;
+const gte = (value) => ({ $ge: value });
 exports.gte = gte;
-const lt = (value) => ({ _lt: value });
+const lt = (value) => ({ $lt: value });
 exports.lt = lt;
-const lte = (value) => ({ _lte: value });
+const lte = (value) => ({ $le: value });
 exports.lte = lte;
-const exists = (column) => ({ _exists: column });
+const le = (value) => ({ $le: value });
+exports.le = le;
+const exists = (column) => ({ $exists: column });
 exports.exists = exists;
-const notExists = (column) => ({ _notExists: column });
+const notExists = (column) => ({ $notExists: column });
 exports.notExists = notExists;
-const startsWith = (value) => ({ _startsWith: value });
+const startsWith = (value) => ({ $startsWith: value });
 exports.startsWith = startsWith;
-const endsWith = (value) => ({ _endsWith: value });
+const endsWith = (value) => ({ $endsWith: value });
 exports.endsWith = endsWith;
-const pattern = (value) => ({ _pattern: value });
+const pattern = (value) => ({ $pattern: value });
 exports.pattern = pattern;
-const isNot = (value) => ({ _isNot: value });
+const is = (value) => ({ $is: value });
+exports.is = is;
+const isNot = (value) => ({ $isNot: value });
 exports.isNot = isNot;
+const contains = (value) => ({ $contains: value });
+exports.contains = contains;
 // TODO: these can only be applied to columns of type "multiple"
-const includes = (value) => ({ _includes: value });
+const includes = (value) => ({ $includes: value });
 exports.includes = includes;
-const includesSubstring = (value) => ({ _includesSubstring: value });
+const includesSubstring = (value) => ({ $includesSubstring: value });
 exports.includesSubstring = includesSubstring;
-const includesPattern = (value) => ({ _includesPattern: value });
+const includesPattern = (value) => ({ $includesPattern: value });
 exports.includesPattern = includesPattern;
-const includesAll = (value) => ({ _includesAll: value });
+const includesAll = (value) => ({ $includesAll: value });
 exports.includesAll = includesAll;
 class Query {
     constructor(repository, table, data, parent) {
@@ -50,11 +58,11 @@ class Query {
         this.table = table;
         // For some reason Object.assign(this, parent) didn't work in this case
         // so doing all this manually:
-        this._any = parent === null || parent === void 0 ? void 0 : parent._any;
-        this._all = parent === null || parent === void 0 ? void 0 : parent._all;
-        this._not = parent === null || parent === void 0 ? void 0 : parent._not;
-        this._none = parent === null || parent === void 0 ? void 0 : parent._none;
-        this._sort = parent === null || parent === void 0 ? void 0 : parent._sort;
+        this.$any = parent === null || parent === void 0 ? void 0 : parent.$any;
+        this.$all = parent === null || parent === void 0 ? void 0 : parent.$all;
+        this.$not = parent === null || parent === void 0 ? void 0 : parent.$not;
+        this.$none = parent === null || parent === void 0 ? void 0 : parent.$none;
+        this.$sort = parent === null || parent === void 0 ? void 0 : parent.$sort;
         Object.assign(this, data);
         // These bindings are used to support deconstructing
         // const { any, not, filter, sort } = xata.users.query()
@@ -64,25 +72,27 @@ class Query {
         this.filter = this.filter.bind(this);
         this.sort = this.sort.bind(this);
         this.none = this.none.bind(this);
+        Object.defineProperty(this, 'table', { enumerable: false });
+        Object.defineProperty(this, 'repository', { enumerable: false });
     }
     any(...queries) {
         return new Query(this.repository, this.table, {
-            _any: (this._any || []).concat(queries)
+            $any: (this.$any || []).concat(queries)
         }, this);
     }
     all(...queries) {
         return new Query(this.repository, this.table, {
-            _all: (this._all || []).concat(queries)
+            $all: (this.$all || []).concat(queries)
         }, this);
     }
     not(...queries) {
         return new Query(this.repository, this.table, {
-            _not: (this._not || []).concat(queries)
+            $not: (this.$not || []).concat(queries)
         }, this);
     }
     none(...queries) {
         return new Query(this.repository, this.table, {
-            _none: (this._none || []).concat(queries)
+            $none: (this.$none || []).concat(queries)
         }, this);
     }
     filter(a, b) {
@@ -93,21 +103,21 @@ class Query {
                 queries.push({ [column]: constraint });
             }
             return new Query(this.repository, this.table, {
-                _any: (this._any || []).concat(queries)
+                $all: (this.$all || []).concat(queries)
             }, this);
         }
         else {
             const column = a;
             const value = b;
             return new Query(this.repository, this.table, {
-                _any: (this._any || []).concat({ [column]: value })
+                $all: (this.$all || []).concat({ [column]: value })
             }, this);
         }
     }
     sort(column, direction) {
-        const sort = Object.assign(Object.assign({}, this._sort), { [column]: direction });
+        const sort = Object.assign(Object.assign({}, this.$sort), { [column]: direction });
         const q = new Query(this.repository, this.table, {
-            _sort: sort
+            $sort: sort
         }, this);
         return q;
     }
@@ -136,18 +146,6 @@ class Query {
         // TODO
         return this;
     }
-    toJSON() {
-        const _filter = {
-            _any: this._any,
-            _all: this._all,
-            _not: this._not,
-            _none: this._none
-        };
-        return {
-            _filter: Object.values(_filter).some(Boolean) ? _filter : undefined,
-            _sort: this._sort
-        };
-    }
 }
 exports.Query = Query;
 class Repository extends Query {
@@ -186,13 +184,13 @@ class RestRepository extends Repository {
     }
     request(method, path, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { url: xatabaseURL } = this.client.options;
-            const resp = yield this.fetch(`${xatabaseURL}${path}`, {
+            const { databaseURL } = this.client.options;
+            const resp = yield this.fetch(`${databaseURL}${path}`, {
                 method,
                 headers: {
                     Accept: '*/*',
                     'Content-Type': 'application/json',
-                    Authorization: `Bearer ${this.client.options.token}`
+                    Authorization: `Bearer ${this.client.options.apiKey}`
                 },
                 body: JSON.stringify(body)
             });
@@ -222,7 +220,14 @@ class RestRepository extends Repository {
     }
     create(object) {
         return __awaiter(this, void 0, void 0, function* () {
-            const obj = yield this.request('POST', `/tables/${this.table}/data`, object);
+            const body = Object.assign({}, object);
+            for (const key of Object.keys(body)) {
+                const value = body[key];
+                if (value && typeof value === 'object' && typeof value._id === 'string') {
+                    body[key] = value._id;
+                }
+            }
+            const obj = yield this.request('POST', `/tables/${this.table}/data`, body);
             return this.client.initObject(this.table, obj);
         });
     }
@@ -252,7 +257,17 @@ class RestRepository extends Repository {
     }
     query(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.request('POST', `/tables/${this.table}/query`, query);
+            const filter = {
+                $any: query.$any,
+                $all: query.$all,
+                $not: query.$not,
+                $none: query.$none
+            };
+            const body = {
+                filter: Object.values(filter).some(Boolean) ? filter : undefined,
+                sort: query.$sort
+            };
+            const result = yield this.request('POST', `/tables/${this.table}/query`, body);
             return result.records.map((record) => this.client.initObject(this.table, record));
         });
     }

package/dist/index.test.js

@@ -13,8 +13,8 @@ const _1 = require("./");
 const fetch = jest.fn();
 const client = new _1.BaseClient({
     fetch,
-    token: '1234',
-    url: 'https://my-workspace-5df34do.staging.xatabase.co/db/xata:main'
+    apiKey: '1234',
+    databaseURL: 'https://my-workspace-5df34do.staging.xatabase.co/db/xata:main'
 }, {});
 const users = new _1.RestRepository(client, 'users');
 describe('request', () => {
@@ -119,7 +119,7 @@ describe('query', () => {
             expectRequest(expected, () => users.getMany(), { records: [] });
         }));
         test('query with one filter', () => __awaiter(void 0, void 0, void 0, function* () {
-            const expected = { method: 'POST', path: '/tables/users/query', body: { _filter: { _any: [{ name: 'foo' }] } } };
+            const expected = { method: 'POST', path: '/tables/users/query', body: { filter: { $all: [{ name: 'foo' }] } } };
             expectRequest(expected, () => users.filter('name', 'foo').getMany(), { records: [] });
         }));
     });

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@xata.io/client",
-  "version": "0.1.0",
-  "description": "Xata.io SDK for TypesScript and JavaScript",
-  "main": "index.js",
+  "version": "0.1.4",
+  "description": "Xata.io SDK for TypeScript and JavaScript",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc",

package/src/index.test.ts

@@ -4,8 +4,8 @@ const fetch = jest.fn();
 const client = new BaseClient(
   {
     fetch,
-    token: '1234',
-    url: 'https://my-workspace-5df34do.staging.xatabase.co/db/xata:main'
+    apiKey: '1234',
+    databaseURL: 'https://my-workspace-5df34do.staging.xatabase.co/db/xata:main'
   },
   {}
 );
@@ -138,7 +138,7 @@ describe('query', () => {
     });
 
     test('query with one filter', async () => {
-      const expected = { method: 'POST', path: '/tables/users/query', body: { _filter: { _any: [{ name: 'foo' }] } } };
+      const expected = { method: 'POST', path: '/tables/users/query', body: { filter: { $all: [{ name: 'foo' }] } } };
       expectRequest(expected, () => users.filter('name', 'foo').getMany(), { records: [] });
     });
   });

package/src/index.ts

@@ -34,46 +34,58 @@ export type Include<T> = {
 type SortDirection = 'asc' | 'desc';
 
 type Operator =
-  | '_gt'
-  | '_lt'
-  | '_gte'
-  | '_lte'
-  | '_exists'
-  | '_notExists'
-  | '_endsWith'
-  | '_startsWith'
-  | '_pattern'
-  | '_isNot'
-  | '_includes'
-  | '_includesSubstring'
-  | '_includesPattern'
-  | '_includesAll';
+  | '$gt'
+  | '$lt'
+  | '$ge'
+  | '$le'
+  | '$exists'
+  | '$notExists'
+  | '$endsWith'
+  | '$startsWith'
+  | '$pattern'
+  | '$is'
+  | '$isNot'
+  | '$contains'
+  | '$includes'
+  | '$includesSubstring'
+  | '$includesPattern'
+  | '$includesAll';
 
 // TODO: restrict constraints depending on type?
 // E.g. startsWith cannot be used with numbers
 type Constraint<T> = Partial<Record<Operator, T>>;
 
+type DeepConstraint<T> = T extends Record<string, any>
+  ? {
+      [key in keyof T]?: T[key] | DeepConstraint<T[key]>;
+    }
+  : Constraint<T>;
+
 type ComparableType = number | Date;
 
-export const gt = <T extends ComparableType>(value: T): Constraint<T> => ({ _gt: value });
-export const gte = <T extends ComparableType>(value: T): Constraint<T> => ({ _gte: value });
-export const lt = <T extends ComparableType>(value: T): Constraint<T> => ({ _lt: value });
-export const lte = <T extends ComparableType>(value: T): Constraint<T> => ({ _lte: value });
-export const exists = (column: string): Constraint<string> => ({ _exists: column });
-export const notExists = (column: string): Constraint<string> => ({ _notExists: column });
-export const startsWith = (value: string): Constraint<string> => ({ _startsWith: value });
-export const endsWith = (value: string): Constraint<string> => ({ _endsWith: value });
-export const pattern = (value: string): Constraint<string> => ({ _pattern: value });
-export const isNot = <T>(value: T): Constraint<T> => ({ _isNot: value });
+export const gt = <T extends ComparableType>(value: T): Constraint<T> => ({ $gt: value });
+export const ge = <T extends ComparableType>(value: T): Constraint<T> => ({ $ge: value });
+export const gte = <T extends ComparableType>(value: T): Constraint<T> => ({ $ge: value });
+export const lt = <T extends ComparableType>(value: T): Constraint<T> => ({ $lt: value });
+export const lte = <T extends ComparableType>(value: T): Constraint<T> => ({ $le: value });
+export const le = <T extends ComparableType>(value: T): Constraint<T> => ({ $le: value });
+export const exists = (column: string): Constraint<string> => ({ $exists: column });
+export const notExists = (column: string): Constraint<string> => ({ $notExists: column });
+export const startsWith = (value: string): Constraint<string> => ({ $startsWith: value });
+export const endsWith = (value: string): Constraint<string> => ({ $endsWith: value });
+export const pattern = (value: string): Constraint<string> => ({ $pattern: value });
+export const is = <T>(value: T): Constraint<T> => ({ $is: value });
+export const isNot = <T>(value: T): Constraint<T> => ({ $isNot: value });
+export const contains = <T>(value: T): Constraint<T> => ({ $contains: value });
 
 // TODO: these can only be applied to columns of type "multiple"
-export const includes = (value: string): Constraint<string> => ({ _includes: value });
-export const includesSubstring = (value: string): Constraint<string> => ({ _includesSubstring: value });
-export const includesPattern = (value: string): Constraint<string> => ({ _includesPattern: value });
-export const includesAll = (value: string): Constraint<string> => ({ _includesAll: value });
+export const includes = (value: string): Constraint<string> => ({ $includes: value });
+export const includesSubstring = (value: string): Constraint<string> => ({ $includesSubstring: value });
+export const includesPattern = (value: string): Constraint<string> => ({ $includesPattern: value });
+export const includesAll = (value: string): Constraint<string> => ({ $includesAll: value });
 
 type FilterConstraints<T> = {
-  [key in keyof T]?: T[key] extends Record<string, any> ? FilterConstraints<T[key]> : T[key] | Constraint<T[key]>;
+  [key in keyof T]?: T[key] extends Record<string, any> ? FilterConstraints<T[key]> : T[key] | DeepConstraint<T[key]>;
 };
 
 type BulkQueryOptions<T> = {
@@ -92,11 +104,11 @@ export class Query<T, R = T> {
   table: string;
   repository: Repository<T>;
 
-  readonly _any?: QueryOrConstraint<T, R>[];
-  readonly _all?: QueryOrConstraint<T, R>[];
-  readonly _not?: QueryOrConstraint<T, R>[];
-  readonly _none?: QueryOrConstraint<T, R>[];
-  readonly _sort?: Record<string, SortDirection>;
+  readonly $any?: QueryOrConstraint<T, R>[];
+  readonly $all?: QueryOrConstraint<T, R>[];
+  readonly $not?: QueryOrConstraint<T, R>[];
+  readonly $none?: QueryOrConstraint<T, R>[];
+  readonly $sort?: Record<string, SortDirection>;
 
   constructor(repository: Repository<T> | null, table: string, data: Partial<Query<T, R>>, parent?: Query<T, R>) {
     if (repository) {
@@ -108,11 +120,11 @@ export class Query<T, R = T> {
 
     // For some reason Object.assign(this, parent) didn't work in this case
     // so doing all this manually:
-    this._any = parent?._any;
-    this._all = parent?._all;
-    this._not = parent?._not;
-    this._none = parent?._none;
-    this._sort = parent?._sort;
+    this.$any = parent?.$any;
+    this.$all = parent?.$all;
+    this.$not = parent?.$not;
+    this.$none = parent?.$none;
+    this.$sort = parent?.$sort;
 
     Object.assign(this, data);
     // These bindings are used to support deconstructing
@@ -123,6 +135,9 @@ export class Query<T, R = T> {
     this.filter = this.filter.bind(this);
     this.sort = this.sort.bind(this);
     this.none = this.none.bind(this);
+
+    Object.defineProperty(this, 'table', { enumerable: false });
+    Object.defineProperty(this, 'repository', { enumerable: false });
   }
 
   any(...queries: Query<T, R>[]): Query<T, R> {
@@ -130,7 +145,7 @@ export class Query<T, R = T> {
       this.repository,
       this.table,
       {
-        _any: (this._any || []).concat(queries)
+        $any: (this.$any || []).concat(queries)
       },
       this
     );
@@ -141,7 +156,7 @@ export class Query<T, R = T> {
       this.repository,
       this.table,
       {
-        _all: (this._all || []).concat(queries)
+        $all: (this.$all || []).concat(queries)
       },
       this
     );
@@ -152,7 +167,7 @@ export class Query<T, R = T> {
       this.repository,
       this.table,
       {
-        _not: (this._not || []).concat(queries)
+        $not: (this.$not || []).concat(queries)
       },
       this
     );
@@ -163,14 +178,14 @@ export class Query<T, R = T> {
       this.repository,
       this.table,
       {
-        _none: (this._none || []).concat(queries)
+        $none: (this.$none || []).concat(queries)
       },
       this
     );
   }
 
   filter(constraints: FilterConstraints<T>): Query<T, R>;
-  filter<F extends keyof T>(column: F, value: FilterConstraints<T[F]> | Constraint<T[F]>): Query<T, R>;
+  filter<F extends keyof T>(column: F, value: FilterConstraints<T[F]> | DeepConstraint<T[F]>): Query<T, R>;
   filter(a: any, b?: any): Query<T, R> {
     if (arguments.length === 1) {
       const constraints = a as FilterConstraints<T>;
@@ -182,7 +197,7 @@ export class Query<T, R = T> {
         this.repository,
         this.table,
         {
-          _any: (this._any || []).concat(queries)
+          $all: (this.$all || []).concat(queries)
         },
         this
       );
@@ -193,7 +208,7 @@ export class Query<T, R = T> {
         this.repository,
         this.table,
         {
-          _any: (this._any || []).concat({ [column]: value })
+          $all: (this.$all || []).concat({ [column]: value })
         },
         this
       );
@@ -201,12 +216,12 @@ export class Query<T, R = T> {
   }
 
   sort<F extends keyof T>(column: F, direction: SortDirection): Query<T, R> {
-    const sort = { ...this._sort, [column]: direction };
+    const sort = { ...this.$sort, [column]: direction };
     const q = new Query<T, R>(
       this.repository,
       this.table,
       {
-        _sort: sort
+        $sort: sort
       },
       this
     );
@@ -236,19 +251,6 @@ export class Query<T, R = T> {
     // TODO
     return this;
   }
-
-  toJSON() {
-    const _filter = {
-      _any: this._any,
-      _all: this._all,
-      _not: this._not,
-      _none: this._none
-    };
-    return {
-      _filter: Object.values(_filter).some(Boolean) ? _filter : undefined,
-      _sort: this._sort
-    };
-  }
 }
 
 export abstract class Repository<T> extends Query<T, Selectable<T>> {
@@ -300,13 +302,13 @@ export class RestRepository<T> extends Repository<T> {
   }
 
   async request(method: string, path: string, body?: unknown) {
-    const { url: xatabaseURL } = this.client.options;
-    const resp: Response = await this.fetch(`${xatabaseURL}${path}`, {
+    const { databaseURL } = this.client.options;
+    const resp: Response = await this.fetch(`${databaseURL}${path}`, {
       method,
       headers: {
         Accept: '*/*',
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${this.client.options.token}`
+        Authorization: `Bearer ${this.client.options.apiKey}`
       },
       body: JSON.stringify(body)
     });
@@ -333,7 +335,14 @@ export class RestRepository<T> extends Repository<T> {
   }
 
   async create(object: T): Promise<T> {
-    const obj = await this.request('POST', `/tables/${this.table}/data`, object);
+    const body = { ...object } as Record<string, unknown>;
+    for (const key of Object.keys(body)) {
+      const value = body[key];
+      if (value && typeof value === 'object' && typeof (value as Record<string, unknown>)._id === 'string') {
+        body[key] = (value as XataRecord)._id;
+      }
+    }
+    const obj = await this.request('POST', `/tables/${this.table}/data`, body);
     return this.client.initObject(this.table, obj);
   }
 
@@ -357,7 +366,17 @@ export class RestRepository<T> extends Repository<T> {
   }
 
   async query<R>(query: Query<T, R>): Promise<R[]> {
-    const result = await this.request('POST', `/tables/${this.table}/query`, query);
+    const filter = {
+      $any: query.$any,
+      $all: query.$all,
+      $not: query.$not,
+      $none: query.$none
+    };
+    const body = {
+      filter: Object.values(filter).some(Boolean) ? filter : undefined,
+      sort: query.$sort
+    };
+    const result = await this.request('POST', `/tables/${this.table}/query`, body);
     return result.records.map((record: object) => this.client.initObject(this.table, record));
   }
 }
@@ -374,8 +393,8 @@ export class RestRespositoryFactory implements RepositoryFactory {
 
 export type XataClientOptions = {
   fetch?: unknown;
-  url: string;
-  token: string;
+  databaseURL: string;
+  apiKey: string;
   repositoryFactory?: RepositoryFactory;
 };