@xata.io/client 0.0.0-alpha.ved00a04 → 0.0.0-alpha.vedb9a46

package/dist/index.mjs

@@ -7,8 +7,11 @@ function compact(arr) {
 function isObject(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
+function isDefined(value) {
+  return value !== null && value !== void 0;
+}
 function isString(value) {
-  return value !== void 0 && value !== null && typeof value === "string";
+  return isDefined(value) && typeof value === "string";
 }
 function toBase64(value) {
   try {
@@ -34,7 +37,10 @@ function getEnvVariable(name) {
 }
 async function getGitBranch() {
   try {
-    return require("child_process").execSync("git branch --show-current", { encoding: "utf-8" }).trim();
+    if (typeof require === "function") {
+      const req = require;
+      return req("child_process").execSync("git branch --show-current", { encoding: "utf-8" }).trim();
+    }
   } catch (err) {
   }
   try {
@@ -67,7 +73,12 @@ function getFetchImplementation(userFetch) {
   return fetchImpl;
 }
 
-class FetcherError extends Error {
+class ErrorWithCause extends Error {
+  constructor(message, options) {
+    super(message, options);
+  }
+}
+class FetcherError extends ErrorWithCause {
   constructor(status, data) {
     super(getMessage(data));
     this.status = status;
@@ -248,6 +259,14 @@ const deleteDatabase = (variables) => fetch$1({
   method: "delete",
   ...variables
 });
+const getGitBranchesMapping = (variables) => fetch$1({ url: "/dbs/{dbName}/gitBranches", method: "get", ...variables });
+const addGitBranchesEntry = (variables) => fetch$1({ url: "/dbs/{dbName}/gitBranches", method: "post", ...variables });
+const removeGitBranchesEntry = (variables) => fetch$1({ url: "/dbs/{dbName}/gitBranches", method: "delete", ...variables });
+const resolveBranch = (variables) => fetch$1({
+  url: "/dbs/{dbName}/resolveBranch",
+  method: "get",
+  ...variables
+});
 const getBranchDetails = (variables) => fetch$1({
   url: "/db/{dbBranchName}",
   method: "get",
@@ -276,17 +295,6 @@ const getBranchMetadata = (variables) => fetch$1({
 const getBranchMigrationHistory = (variables) => fetch$1({ url: "/db/{dbBranchName}/migrations", method: "get", ...variables });
 const executeBranchMigrationPlan = (variables) => fetch$1({ url: "/db/{dbBranchName}/migrations/execute", method: "post", ...variables });
 const getBranchMigrationPlan = (variables) => fetch$1({ url: "/db/{dbBranchName}/migrations/plan", method: "post", ...variables });
-const compareBranchSchema = (variables) => fetch$1({
-  url: "/db/{dbBranchName}/schema/compare/{branchName}",
-  method: "post",
-  ...variables
-});
-const updateBranchSchema = (variables) => fetch$1({
-  url: "/db/{dbBranchName}/schema/update",
-  method: "post",
-  ...variables
-});
-const getBranchSchemaHistory = (variables) => fetch$1({ url: "/db/{dbBranchName}/schema/history", method: "post", ...variables });
 const getBranchStats = (variables) => fetch$1({
   url: "/db/{dbBranchName}/stats",
   method: "get",
@@ -366,6 +374,11 @@ const queryTable = (variables) => fetch$1({
   method: "post",
   ...variables
 });
+const searchTable = (variables) => fetch$1({
+  url: "/db/{dbBranchName}/tables/{tableName}/search",
+  method: "post",
+  ...variables
+});
 const searchBranch = (variables) => fetch$1({
   url: "/db/{dbBranchName}/search",
   method: "post",
@@ -387,7 +400,15 @@ const operationsByTag = {
     resendWorkspaceMemberInvite,
     acceptWorkspaceMemberInvite
   },
-  database: { getDatabaseList, createDatabase, deleteDatabase },
+  database: {
+    getDatabaseList,
+    createDatabase,
+    deleteDatabase,
+    getGitBranchesMapping,
+    addGitBranchesEntry,
+    removeGitBranchesEntry,
+    resolveBranch
+  },
   branch: {
     getBranchList,
     getBranchDetails,
@@ -398,9 +419,6 @@ const operationsByTag = {
     getBranchMigrationHistory,
     executeBranchMigrationPlan,
     getBranchMigrationPlan,
-    compareBranchSchema,
-    updateBranchSchema,
-    getBranchSchemaHistory,
     getBranchStats
   },
   table: {
@@ -424,6 +442,7 @@ const operationsByTag = {
     getRecord,
     bulkInsertTableRecords,
     queryTable,
+    searchTable,
     searchBranch
   }
 };
@@ -457,7 +476,7 @@ var __accessCheck$7 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$6 = (obj, member, getter) => {
+var __privateGet$7 = (obj, member, getter) => {
   __accessCheck$7(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -466,7 +485,7 @@ var __privateAdd$7 = (obj, member, value) => {
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
-var __privateSet$5 = (obj, member, value, setter) => {
+var __privateSet$6 = (obj, member, value, setter) => {
   __accessCheck$7(obj, member, "write to private field");
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
@@ -481,7 +500,7 @@ class XataApiClient {
     if (!apiKey) {
       throw new Error("Could not resolve a valid apiKey");
     }
-    __privateSet$5(this, _extraProps, {
+    __privateSet$6(this, _extraProps, {
       apiUrl: getHostUrl(provider, "main"),
       workspacesApiUrl: getHostUrl(provider, "workspaces"),
       fetchImpl: getFetchImplementation(options.fetch),
@@ -489,34 +508,34 @@ class XataApiClient {
     });
   }
   get user() {
-    if (!__privateGet$6(this, _namespaces).user)
-      __privateGet$6(this, _namespaces).user = new UserApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).user;
+    if (!__privateGet$7(this, _namespaces).user)
+      __privateGet$7(this, _namespaces).user = new UserApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).user;
   }
   get workspaces() {
-    if (!__privateGet$6(this, _namespaces).workspaces)
-      __privateGet$6(this, _namespaces).workspaces = new WorkspaceApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).workspaces;
+    if (!__privateGet$7(this, _namespaces).workspaces)
+      __privateGet$7(this, _namespaces).workspaces = new WorkspaceApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).workspaces;
   }
   get databases() {
-    if (!__privateGet$6(this, _namespaces).databases)
-      __privateGet$6(this, _namespaces).databases = new DatabaseApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).databases;
+    if (!__privateGet$7(this, _namespaces).databases)
+      __privateGet$7(this, _namespaces).databases = new DatabaseApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).databases;
   }
   get branches() {
-    if (!__privateGet$6(this, _namespaces).branches)
-      __privateGet$6(this, _namespaces).branches = new BranchApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).branches;
+    if (!__privateGet$7(this, _namespaces).branches)
+      __privateGet$7(this, _namespaces).branches = new BranchApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).branches;
   }
   get tables() {
-    if (!__privateGet$6(this, _namespaces).tables)
-      __privateGet$6(this, _namespaces).tables = new TableApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).tables;
+    if (!__privateGet$7(this, _namespaces).tables)
+      __privateGet$7(this, _namespaces).tables = new TableApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).tables;
   }
   get records() {
-    if (!__privateGet$6(this, _namespaces).records)
-      __privateGet$6(this, _namespaces).records = new RecordsApi(__privateGet$6(this, _extraProps));
-    return __privateGet$6(this, _namespaces).records;
+    if (!__privateGet$7(this, _namespaces).records)
+      __privateGet$7(this, _namespaces).records = new RecordsApi(__privateGet$7(this, _extraProps));
+    return __privateGet$7(this, _namespaces).records;
   }
 }
 _extraProps = new WeakMap();
@@ -650,6 +669,33 @@ class DatabaseApi {
       ...this.extraProps
     });
   }
+  getGitBranchesMapping(workspace, dbName) {
+    return operationsByTag.database.getGitBranchesMapping({
+      pathParams: { workspace, dbName },
+      ...this.extraProps
+    });
+  }
+  addGitBranchesEntry(workspace, dbName, body) {
+    return operationsByTag.database.addGitBranchesEntry({
+      pathParams: { workspace, dbName },
+      body,
+      ...this.extraProps
+    });
+  }
+  removeGitBranchesEntry(workspace, dbName, gitBranch) {
+    return operationsByTag.database.removeGitBranchesEntry({
+      pathParams: { workspace, dbName },
+      queryParams: { gitBranch },
+      ...this.extraProps
+    });
+  }
+  resolveBranch(workspace, dbName, gitBranch) {
+    return operationsByTag.database.resolveBranch({
+      pathParams: { workspace, dbName },
+      queryParams: { gitBranch },
+      ...this.extraProps
+    });
+  }
 }
 class BranchApi {
   constructor(extraProps) {
@@ -667,10 +713,10 @@ class BranchApi {
       ...this.extraProps
     });
   }
-  createBranch(workspace, database, branch, from = "", options = {}) {
+  createBranch(workspace, database, branch, from, options = {}) {
     return operationsByTag.branch.createBranch({
       pathParams: { workspace, dbBranchName: `${database}:${branch}` },
-      queryParams: { from },
+      queryParams: isString(from) ? { from } : void 0,
       body: options,
       ...this.extraProps
     });
@@ -852,6 +898,13 @@ class RecordsApi {
       ...this.extraProps
     });
   }
+  searchTable(workspace, database, branch, tableName, query) {
+    return operationsByTag.records.searchTable({
+      pathParams: { workspace, dbBranchName: `${database}:${branch}`, tableName },
+      body: query,
+      ...this.extraProps
+    });
+  }
   searchBranch(workspace, database, branch, query) {
     return operationsByTag.records.searchBranch({
       pathParams: { workspace, dbBranchName: `${database}:${branch}` },
@@ -875,7 +928,7 @@ var __accessCheck$6 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$5 = (obj, member, getter) => {
+var __privateGet$6 = (obj, member, getter) => {
   __accessCheck$6(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -884,30 +937,30 @@ var __privateAdd$6 = (obj, member, value) => {
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
-var __privateSet$4 = (obj, member, value, setter) => {
+var __privateSet$5 = (obj, member, value, setter) => {
   __accessCheck$6(obj, member, "write to private field");
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _query;
+var _query, _page;
 class Page {
   constructor(query, meta, records = []) {
     __privateAdd$6(this, _query, void 0);
-    __privateSet$4(this, _query, query);
+    __privateSet$5(this, _query, query);
     this.meta = meta;
-    this.records = records;
+    this.records = new RecordArray(this, records);
   }
   async nextPage(size, offset) {
-    return __privateGet$5(this, _query).getPaginated({ page: { size, offset, after: this.meta.page.cursor } });
+    return __privateGet$6(this, _query).getPaginated({ pagination: { size, offset, after: this.meta.page.cursor } });
   }
   async previousPage(size, offset) {
-    return __privateGet$5(this, _query).getPaginated({ page: { size, offset, before: this.meta.page.cursor } });
+    return __privateGet$6(this, _query).getPaginated({ pagination: { size, offset, before: this.meta.page.cursor } });
   }
   async firstPage(size, offset) {
-    return __privateGet$5(this, _query).getPaginated({ page: { size, offset, first: this.meta.page.cursor } });
+    return __privateGet$6(this, _query).getPaginated({ pagination: { size, offset, first: this.meta.page.cursor } });
   }
   async lastPage(size, offset) {
-    return __privateGet$5(this, _query).getPaginated({ page: { size, offset, last: this.meta.page.cursor } });
+    return __privateGet$6(this, _query).getPaginated({ pagination: { size, offset, last: this.meta.page.cursor } });
   }
   hasNextPage() {
     return this.meta.page.more;
@@ -915,15 +968,46 @@ class Page {
 }
 _query = new WeakMap();
 const PAGINATION_MAX_SIZE = 200;
-const PAGINATION_DEFAULT_SIZE = 200;
+const PAGINATION_DEFAULT_SIZE = 20;
 const PAGINATION_MAX_OFFSET = 800;
 const PAGINATION_DEFAULT_OFFSET = 0;
+function isCursorPaginationOptions(options) {
+  return isDefined(options) && (isDefined(options.first) || isDefined(options.last) || isDefined(options.after) || isDefined(options.before));
+}
+const _RecordArray = class extends Array {
+  constructor(page, overrideRecords) {
+    super(...overrideRecords ?? page.records);
+    __privateAdd$6(this, _page, void 0);
+    __privateSet$5(this, _page, page);
+  }
+  async nextPage(size, offset) {
+    const newPage = await __privateGet$6(this, _page).nextPage(size, offset);
+    return new _RecordArray(newPage);
+  }
+  async previousPage(size, offset) {
+    const newPage = await __privateGet$6(this, _page).previousPage(size, offset);
+    return new _RecordArray(newPage);
+  }
+  async firstPage(size, offset) {
+    const newPage = await __privateGet$6(this, _page).firstPage(size, offset);
+    return new _RecordArray(newPage);
+  }
+  async lastPage(size, offset) {
+    const newPage = await __privateGet$6(this, _page).lastPage(size, offset);
+    return new _RecordArray(newPage);
+  }
+  hasNextPage() {
+    return __privateGet$6(this, _page).meta.page.more;
+  }
+};
+let RecordArray = _RecordArray;
+_page = new WeakMap();
 
 var __accessCheck$5 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$4 = (obj, member, getter) => {
+var __privateGet$5 = (obj, member, getter) => {
   __accessCheck$5(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -932,34 +1016,35 @@ var __privateAdd$5 = (obj, member, value) => {
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
-var __privateSet$3 = (obj, member, value, setter) => {
+var __privateSet$4 = (obj, member, value, setter) => {
   __accessCheck$5(obj, member, "write to private field");
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
 var _table$1, _repository, _data;
 const _Query = class {
-  constructor(repository, table, data, parent) {
+  constructor(repository, table, data, rawParent) {
     __privateAdd$5(this, _table$1, void 0);
     __privateAdd$5(this, _repository, void 0);
     __privateAdd$5(this, _data, { filter: {} });
     this.meta = { page: { cursor: "start", more: true } };
-    this.records = [];
-    __privateSet$3(this, _table$1, table);
+    this.records = new RecordArray(this, []);
+    __privateSet$4(this, _table$1, table);
     if (repository) {
-      __privateSet$3(this, _repository, repository);
+      __privateSet$4(this, _repository, repository);
     } else {
-      __privateSet$3(this, _repository, this);
+      __privateSet$4(this, _repository, this);
     }
-    __privateGet$4(this, _data).filter = data.filter ?? parent?.filter ?? {};
-    __privateGet$4(this, _data).filter.$any = data.filter?.$any ?? parent?.filter?.$any;
-    __privateGet$4(this, _data).filter.$all = data.filter?.$all ?? parent?.filter?.$all;
-    __privateGet$4(this, _data).filter.$not = data.filter?.$not ?? parent?.filter?.$not;
-    __privateGet$4(this, _data).filter.$none = data.filter?.$none ?? parent?.filter?.$none;
-    __privateGet$4(this, _data).sort = data.sort ?? parent?.sort;
-    __privateGet$4(this, _data).columns = data.columns ?? parent?.columns ?? ["*"];
-    __privateGet$4(this, _data).page = data.page ?? parent?.page;
-    __privateGet$4(this, _data).cache = data.cache ?? parent?.cache;
+    const parent = cleanParent(data, rawParent);
+    __privateGet$5(this, _data).filter = data.filter ?? parent?.filter ?? {};
+    __privateGet$5(this, _data).filter.$any = data.filter?.$any ?? parent?.filter?.$any;
+    __privateGet$5(this, _data).filter.$all = data.filter?.$all ?? parent?.filter?.$all;
+    __privateGet$5(this, _data).filter.$not = data.filter?.$not ?? parent?.filter?.$not;
+    __privateGet$5(this, _data).filter.$none = data.filter?.$none ?? parent?.filter?.$none;
+    __privateGet$5(this, _data).sort = data.sort ?? parent?.sort;
+    __privateGet$5(this, _data).columns = data.columns ?? parent?.columns ?? ["*"];
+    __privateGet$5(this, _data).pagination = data.pagination ?? parent?.pagination;
+    __privateGet$5(this, _data).cache = data.cache ?? parent?.cache;
     this.any = this.any.bind(this);
     this.all = this.all.bind(this);
     this.not = this.not.bind(this);
@@ -970,83 +1055,88 @@ const _Query = class {
     Object.defineProperty(this, "repository", { enumerable: false });
   }
   getQueryOptions() {
-    return __privateGet$4(this, _data);
+    return __privateGet$5(this, _data);
   }
   key() {
-    const { columns = [], filter = {}, sort = [], page = {} } = __privateGet$4(this, _data);
-    const key = JSON.stringify({ columns, filter, sort, page });
+    const { columns = [], filter = {}, sort = [], pagination = {} } = __privateGet$5(this, _data);
+    const key = JSON.stringify({ columns, filter, sort, pagination });
     return toBase64(key);
   }
   any(...queries) {
     const $any = queries.map((query) => query.getQueryOptions().filter ?? {});
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $any } }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $any } }, __privateGet$5(this, _data));
   }
   all(...queries) {
     const $all = queries.map((query) => query.getQueryOptions().filter ?? {});
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $all } }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $all } }, __privateGet$5(this, _data));
   }
   not(...queries) {
     const $not = queries.map((query) => query.getQueryOptions().filter ?? {});
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $not } }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $not } }, __privateGet$5(this, _data));
   }
   none(...queries) {
     const $none = queries.map((query) => query.getQueryOptions().filter ?? {});
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $none } }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $none } }, __privateGet$5(this, _data));
   }
   filter(a, b) {
     if (arguments.length === 1) {
       const constraints = Object.entries(a).map(([column, constraint]) => ({ [column]: constraint }));
-      const $all = compact([__privateGet$4(this, _data).filter?.$all].flat().concat(constraints));
-      return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $all } }, __privateGet$4(this, _data));
+      const $all = compact([__privateGet$5(this, _data).filter?.$all].flat().concat(constraints));
+      return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $all } }, __privateGet$5(this, _data));
     } else {
-      const $all = compact([__privateGet$4(this, _data).filter?.$all].flat().concat([{ [a]: b }]));
-      return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { filter: { $all } }, __privateGet$4(this, _data));
+      const $all = compact([__privateGet$5(this, _data).filter?.$all].flat().concat([{ [a]: b }]));
+      return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { filter: { $all } }, __privateGet$5(this, _data));
     }
   }
   sort(column, direction) {
-    const originalSort = [__privateGet$4(this, _data).sort ?? []].flat();
+    const originalSort = [__privateGet$5(this, _data).sort ?? []].flat();
     const sort = [...originalSort, { column, direction }];
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { sort }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { sort }, __privateGet$5(this, _data));
   }
   select(columns) {
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { columns }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { columns }, __privateGet$5(this, _data));
   }
   getPaginated(options = {}) {
-    const query = new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), options, __privateGet$4(this, _data));
-    return __privateGet$4(this, _repository).query(query);
+    const query = new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), options, __privateGet$5(this, _data));
+    return __privateGet$5(this, _repository).query(query);
   }
   async *[Symbol.asyncIterator]() {
-    for await (const [record] of this.getIterator(1)) {
+    for await (const [record] of this.getIterator({ batchSize: 1 })) {
       yield record;
     }
   }
-  async *getIterator(chunk, options = {}) {
-    let offset = 0;
-    let end = false;
-    while (!end) {
-      const { records, meta } = await this.getPaginated({ ...options, page: { size: chunk, offset } });
-      yield records;
-      offset += chunk;
-      end = !meta.page.more;
+  async *getIterator(options = {}) {
+    const { batchSize = 1 } = options;
+    let page = await this.getPaginated({ ...options, pagination: { size: batchSize, offset: 0 } });
+    let more = page.hasNextPage();
+    yield page.records;
+    while (more) {
+      page = await page.nextPage();
+      more = page.hasNextPage();
+      yield page.records;
     }
   }
   async getMany(options = {}) {
-    const { records } = await this.getPaginated(options);
-    return records;
+    const page = await this.getPaginated(options);
+    if (page.hasNextPage() && options.pagination?.size === void 0) {
+      console.trace("Calling getMany does not return all results. Paginate to get all results or call getAll.");
+    }
+    return page.records;
   }
-  async getAll(chunk = PAGINATION_MAX_SIZE, options = {}) {
+  async getAll(options = {}) {
+    const { batchSize = PAGINATION_MAX_SIZE, ...rest } = options;
     const results = [];
-    for await (const page of this.getIterator(chunk, options)) {
+    for await (const page of this.getIterator({ ...rest, batchSize })) {
       results.push(...page);
     }
     return results;
   }
   async getFirst(options = {}) {
-    const records = await this.getMany({ ...options, page: { size: 1 } });
-    return records[0] || null;
+    const records = await this.getMany({ ...options, pagination: { size: 1 } });
+    return records[0] ?? null;
   }
   cache(ttl) {
-    return new _Query(__privateGet$4(this, _repository), __privateGet$4(this, _table$1), { cache: ttl }, __privateGet$4(this, _data));
+    return new _Query(__privateGet$5(this, _repository), __privateGet$5(this, _table$1), { cache: ttl }, __privateGet$5(this, _data));
   }
   nextPage(size, offset) {
     return this.firstPage(size, offset);
@@ -1055,10 +1145,10 @@ const _Query = class {
     return this.firstPage(size, offset);
   }
   firstPage(size, offset) {
-    return this.getPaginated({ page: { size, offset } });
+    return this.getPaginated({ pagination: { size, offset } });
   }
   lastPage(size, offset) {
-    return this.getPaginated({ page: { size, offset, before: "end" } });
+    return this.getPaginated({ pagination: { size, offset, before: "end" } });
   }
   hasNextPage() {
     return this.meta.page.more;
@@ -1068,12 +1158,20 @@ let Query = _Query;
 _table$1 = new WeakMap();
 _repository = new WeakMap();
 _data = new WeakMap();
+function cleanParent(data, parent) {
+  if (isCursorPaginationOptions(data.pagination)) {
+    return { ...parent, sorting: void 0, filter: void 0 };
+  }
+  return parent;
+}
 
 function isIdentifiable(x) {
   return isObject(x) && isString(x?.id);
 }
 function isXataRecord(x) {
-  return isIdentifiable(x) && typeof x?.xata === "object" && typeof x?.xata?.version === "number";
+  const record = x;
+  const metadata = record?.getMetadata();
+  return isIdentifiable(x) && isObject(metadata) && typeof metadata.version === "number";
 }
 
 function isSortFilterString(value) {
@@ -1103,7 +1201,7 @@ var __accessCheck$4 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$3 = (obj, member, getter) => {
+var __privateGet$4 = (obj, member, getter) => {
   __accessCheck$4(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -1112,7 +1210,7 @@ var __privateAdd$4 = (obj, member, value) => {
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
-var __privateSet$2 = (obj, member, value, setter) => {
+var __privateSet$3 = (obj, member, value, setter) => {
   __accessCheck$4(obj, member, "write to private field");
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
@@ -1121,7 +1219,7 @@ var __privateMethod$2 = (obj, member, method) => {
   __accessCheck$4(obj, member, "access private method");
   return method;
 };
-var _table, _links, _getFetchProps, _cache, _insertRecordWithoutId, insertRecordWithoutId_fn, _insertRecordWithId, insertRecordWithId_fn, _bulkInsertTableRecords, bulkInsertTableRecords_fn, _updateRecordWithID, updateRecordWithID_fn, _upsertRecordWithID, upsertRecordWithID_fn, _deleteRecord, deleteRecord_fn, _invalidateCache, invalidateCache_fn, _setCacheRecord, setCacheRecord_fn, _getCacheRecord, getCacheRecord_fn, _setCacheQuery, setCacheQuery_fn, _getCacheQuery, getCacheQuery_fn;
+var _table, _getFetchProps, _cache, _schema$1, _insertRecordWithoutId, insertRecordWithoutId_fn, _insertRecordWithId, insertRecordWithId_fn, _bulkInsertTableRecords, bulkInsertTableRecords_fn, _updateRecordWithID, updateRecordWithID_fn, _upsertRecordWithID, upsertRecordWithID_fn, _deleteRecord, deleteRecord_fn, _invalidateCache, invalidateCache_fn, _setCacheRecord, setCacheRecord_fn, _getCacheRecord, getCacheRecord_fn, _setCacheQuery, setCacheQuery_fn, _getCacheQuery, getCacheQuery_fn, _getSchema$1, getSchema_fn$1;
 class Repository extends Query {
 }
 class RestRepository extends Query {
@@ -1138,18 +1236,20 @@ class RestRepository extends Query {
     __privateAdd$4(this, _getCacheRecord);
     __privateAdd$4(this, _setCacheQuery);
     __privateAdd$4(this, _getCacheQuery);
+    __privateAdd$4(this, _getSchema$1);
     __privateAdd$4(this, _table, void 0);
-    __privateAdd$4(this, _links, void 0);
     __privateAdd$4(this, _getFetchProps, void 0);
     __privateAdd$4(this, _cache, void 0);
-    __privateSet$2(this, _table, options.table);
-    __privateSet$2(this, _links, options.links ?? {});
-    __privateSet$2(this, _getFetchProps, options.pluginOptions.getFetchProps);
+    __privateAdd$4(this, _schema$1, void 0);
+    __privateSet$3(this, _table, options.table);
+    __privateSet$3(this, _getFetchProps, options.pluginOptions.getFetchProps);
     this.db = options.db;
-    __privateSet$2(this, _cache, options.pluginOptions.cache);
+    __privateSet$3(this, _cache, options.pluginOptions.cache);
   }
   async create(a, b) {
     if (Array.isArray(a)) {
+      if (a.length === 0)
+        return [];
       const records = await __privateMethod$2(this, _bulkInsertTableRecords, bulkInsertTableRecords_fn).call(this, a);
       await Promise.all(records.map((record) => __privateMethod$2(this, _setCacheRecord, setCacheRecord_fn).call(this, record)));
       return records;
@@ -1175,26 +1275,36 @@ class RestRepository extends Query {
     }
     throw new Error("Invalid arguments for create method");
   }
-  async read(recordId) {
-    const cacheRecord = await __privateMethod$2(this, _getCacheRecord, getCacheRecord_fn).call(this, recordId);
-    if (cacheRecord)
-      return cacheRecord;
-    const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
-    try {
-      const response = await getRecord({
-        pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table), recordId },
-        ...fetchProps
-      });
-      return initObject(this.db, __privateGet$3(this, _links), __privateGet$3(this, _table), response);
-    } catch (e) {
-      if (isObject(e) && e.status === 404) {
-        return null;
+  async read(a) {
+    if (Array.isArray(a)) {
+      if (a.length === 0)
+        return [];
+      return this.getAll({ filter: { id: { $any: a } } });
+    }
+    if (isString(a)) {
+      const cacheRecord = await __privateMethod$2(this, _getCacheRecord, getCacheRecord_fn).call(this, a);
+      if (cacheRecord)
+        return cacheRecord;
+      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
+      try {
+        const response = await getRecord({
+          pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table), recordId: a },
+          ...fetchProps
+        });
+        const schema = await __privateMethod$2(this, _getSchema$1, getSchema_fn$1).call(this);
+        return initObject(this.db, schema, __privateGet$4(this, _table), response);
+      } catch (e) {
+        if (isObject(e) && e.status === 404) {
+          return null;
+        }
+        throw e;
       }
-      throw e;
     }
   }
   async update(a, b) {
     if (Array.isArray(a)) {
+      if (a.length === 0)
+        return [];
       if (a.length > 100) {
         console.warn("Bulk update operation is not optimized in the Xata API yet, this request might be slow");
       }
@@ -1216,6 +1326,8 @@ class RestRepository extends Query {
   }
   async createOrUpdate(a, b) {
     if (Array.isArray(a)) {
+      if (a.length === 0)
+        return [];
       if (a.length > 100) {
         console.warn("Bulk update operation is not optimized in the Xata API yet, this request might be slow");
       }
@@ -1237,6 +1349,8 @@ class RestRepository extends Query {
   }
   async delete(a) {
     if (Array.isArray(a)) {
+      if (a.length === 0)
+        return;
       if (a.length > 100) {
         console.warn("Bulk delete operation is not optimized in the Xata API yet, this request might be slow");
       }
@@ -1256,13 +1370,19 @@ class RestRepository extends Query {
     throw new Error("Invalid arguments for delete method");
   }
   async search(query, options = {}) {
-    const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
-    const { records } = await searchBranch({
-      pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}" },
-      body: { tables: [__privateGet$3(this, _table)], query, fuzziness: options.fuzziness },
+    const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
+    const { records } = await searchTable({
+      pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table) },
+      body: {
+        query,
+        fuzziness: options.fuzziness,
+        highlight: options.highlight,
+        filter: options.filter
+      },
       ...fetchProps
     });
-    return records.map((item) => initObject(this.db, __privateGet$3(this, _links), __privateGet$3(this, _table), item));
+    const schema = await __privateMethod$2(this, _getSchema$1, getSchema_fn$1).call(this);
+    return records.map((item) => initObject(this.db, schema, __privateGet$4(this, _table), item));
   }
   async query(query) {
     const cacheQuery = await __privateMethod$2(this, _getCacheQuery, getCacheQuery_fn).call(this, query);
@@ -1271,34 +1391,35 @@ class RestRepository extends Query {
     const data = query.getQueryOptions();
     const body = {
       filter: Object.values(data.filter ?? {}).some(Boolean) ? data.filter : void 0,
-      sort: data.sort ? buildSortFilter(data.sort) : void 0,
-      page: data.page,
+      sort: data.sort !== void 0 ? buildSortFilter(data.sort) : void 0,
+      page: data.pagination,
       columns: data.columns
     };
-    const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+    const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
     const { meta, records: objects } = await queryTable({
-      pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table) },
+      pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table) },
       body,
       ...fetchProps
     });
-    const records = objects.map((record) => initObject(this.db, __privateGet$3(this, _links), __privateGet$3(this, _table), record));
+    const schema = await __privateMethod$2(this, _getSchema$1, getSchema_fn$1).call(this);
+    const records = objects.map((record) => initObject(this.db, schema, __privateGet$4(this, _table), record));
     await __privateMethod$2(this, _setCacheQuery, setCacheQuery_fn).call(this, query, meta, records);
     return new Page(query, meta, records);
   }
 }
 _table = new WeakMap();
-_links = new WeakMap();
 _getFetchProps = new WeakMap();
 _cache = new WeakMap();
+_schema$1 = new WeakMap();
 _insertRecordWithoutId = new WeakSet();
 insertRecordWithoutId_fn = async function(object) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const record = transformObjectLinks(object);
   const response = await insertRecord({
     pathParams: {
       workspace: "{workspaceId}",
       dbBranchName: "{dbBranch}",
-      tableName: __privateGet$3(this, _table)
+      tableName: __privateGet$4(this, _table)
     },
     body: record,
     ...fetchProps
@@ -1311,13 +1432,13 @@ insertRecordWithoutId_fn = async function(object) {
 };
 _insertRecordWithId = new WeakSet();
 insertRecordWithId_fn = async function(recordId, object) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const record = transformObjectLinks(object);
   const response = await insertRecordWithID({
     pathParams: {
       workspace: "{workspaceId}",
       dbBranchName: "{dbBranch}",
-      tableName: __privateGet$3(this, _table),
+      tableName: __privateGet$4(this, _table),
       recordId
     },
     body: record,
@@ -1332,10 +1453,10 @@ insertRecordWithId_fn = async function(recordId, object) {
 };
 _bulkInsertTableRecords = new WeakSet();
 bulkInsertTableRecords_fn = async function(objects) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const records = objects.map((object) => transformObjectLinks(object));
   const response = await bulkInsertTableRecords({
-    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table) },
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table) },
     body: { records },
     ...fetchProps
   });
@@ -1347,10 +1468,10 @@ bulkInsertTableRecords_fn = async function(objects) {
 };
 _updateRecordWithID = new WeakSet();
 updateRecordWithID_fn = async function(recordId, object) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const record = transformObjectLinks(object);
   const response = await updateRecordWithID({
-    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table), recordId },
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table), recordId },
     body: record,
     ...fetchProps
   });
@@ -1361,9 +1482,9 @@ updateRecordWithID_fn = async function(recordId, object) {
 };
 _upsertRecordWithID = new WeakSet();
 upsertRecordWithID_fn = async function(recordId, object) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const response = await upsertRecordWithID({
-    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table), recordId },
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table), recordId },
     body: object,
     ...fetchProps
   });
@@ -1374,51 +1495,63 @@ upsertRecordWithID_fn = async function(recordId, object) {
 };
 _deleteRecord = new WeakSet();
 deleteRecord_fn = async function(recordId) {
-  const fetchProps = await __privateGet$3(this, _getFetchProps).call(this);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   await deleteRecord({
-    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$3(this, _table), recordId },
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$4(this, _table), recordId },
     ...fetchProps
   });
 };
 _invalidateCache = new WeakSet();
 invalidateCache_fn = async function(recordId) {
-  await __privateGet$3(this, _cache).delete(`rec_${__privateGet$3(this, _table)}:${recordId}`);
-  const cacheItems = await __privateGet$3(this, _cache).getAll();
+  await __privateGet$4(this, _cache).delete(`rec_${__privateGet$4(this, _table)}:${recordId}`);
+  const cacheItems = await __privateGet$4(this, _cache).getAll();
   const queries = Object.entries(cacheItems).filter(([key]) => key.startsWith("query_"));
   for (const [key, value] of queries) {
     const ids = getIds(value);
     if (ids.includes(recordId))
-      await __privateGet$3(this, _cache).delete(key);
+      await __privateGet$4(this, _cache).delete(key);
   }
 };
 _setCacheRecord = new WeakSet();
 setCacheRecord_fn = async function(record) {
-  if (!__privateGet$3(this, _cache).cacheRecords)
+  if (!__privateGet$4(this, _cache).cacheRecords)
     return;
-  await __privateGet$3(this, _cache).set(`rec_${__privateGet$3(this, _table)}:${record.id}`, record);
+  await __privateGet$4(this, _cache).set(`rec_${__privateGet$4(this, _table)}:${record.id}`, record);
 };
 _getCacheRecord = new WeakSet();
 getCacheRecord_fn = async function(recordId) {
-  if (!__privateGet$3(this, _cache).cacheRecords)
+  if (!__privateGet$4(this, _cache).cacheRecords)
     return null;
-  return __privateGet$3(this, _cache).get(`rec_${__privateGet$3(this, _table)}:${recordId}`);
+  return __privateGet$4(this, _cache).get(`rec_${__privateGet$4(this, _table)}:${recordId}`);
 };
 _setCacheQuery = new WeakSet();
 setCacheQuery_fn = async function(query, meta, records) {
-  await __privateGet$3(this, _cache).set(`query_${__privateGet$3(this, _table)}:${query.key()}`, { date: new Date(), meta, records });
+  await __privateGet$4(this, _cache).set(`query_${__privateGet$4(this, _table)}:${query.key()}`, { date: new Date(), meta, records });
 };
 _getCacheQuery = new WeakSet();
 getCacheQuery_fn = async function(query) {
-  const key = `query_${__privateGet$3(this, _table)}:${query.key()}`;
-  const result = await __privateGet$3(this, _cache).get(key);
+  const key = `query_${__privateGet$4(this, _table)}:${query.key()}`;
+  const result = await __privateGet$4(this, _cache).get(key);
   if (!result)
     return null;
-  const { cache: ttl = __privateGet$3(this, _cache).defaultQueryTTL } = query.getQueryOptions();
-  if (!ttl || ttl < 0)
-    return result;
+  const { cache: ttl = __privateGet$4(this, _cache).defaultQueryTTL } = query.getQueryOptions();
+  if (ttl < 0)
+    return null;
   const hasExpired = result.date.getTime() + ttl < Date.now();
   return hasExpired ? null : result;
 };
+_getSchema$1 = new WeakSet();
+getSchema_fn$1 = async function() {
+  if (__privateGet$4(this, _schema$1))
+    return __privateGet$4(this, _schema$1);
+  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
+  const { schema } = await getBranchDetails({
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}" },
+    ...fetchProps
+  });
+  __privateSet$3(this, _schema$1, schema);
+  return schema;
+};
 const transformObjectLinks = (object) => {
   return Object.entries(object).reduce((acc, [key, value]) => {
     if (key === "xata")
@@ -1426,15 +1559,34 @@ const transformObjectLinks = (object) => {
     return { ...acc, [key]: isIdentifiable(value) ? value.id : value };
   }, {});
 };
-const initObject = (db, links, table, object) => {
+const initObject = (db, schema, table, object) => {
   const result = {};
-  Object.assign(result, object);
-  const tableLinks = links[table] || [];
-  for (const link of tableLinks) {
-    const [field, linkTable] = link;
-    const value = result[field];
-    if (value && isObject(value)) {
-      result[field] = initObject(db, links, linkTable, value);
+  const { xata, ...rest } = object ?? {};
+  Object.assign(result, rest);
+  const { columns } = schema.tables.find(({ name }) => name === table) ?? {};
+  if (!columns)
+    console.error(`Table ${table} not found in schema`);
+  for (const column of columns ?? []) {
+    const value = result[column.name];
+    switch (column.type) {
+      case "datetime": {
+        const date = value !== void 0 ? new Date(value) : void 0;
+        if (date && isNaN(date.getTime())) {
+          console.error(`Failed to parse date ${value} for field ${column.name}`);
+        } else if (date) {
+          result[column.name] = date;
+        }
+        break;
+      }
+      case "link": {
+        const linkTable = column.link?.table;
+        if (!linkTable) {
+          console.error(`Failed to parse link for field ${column.name}`);
+        } else if (isObject(value)) {
+          result[column.name] = initObject(db, schema, linkTable, value);
+        }
+        break;
+      }
     }
   }
   result.read = function() {
@@ -1446,7 +1598,10 @@ const initObject = (db, links, table, object) => {
   result.delete = function() {
     return db[table].delete(result["id"]);
   };
-  for (const prop of ["read", "update", "delete"]) {
+  result.getMetadata = function() {
+    return xata;
+  };
+  for (const prop of ["read", "update", "delete", "getMetadata"]) {
     Object.defineProperty(result, prop, { enumerable: false });
   }
   Object.freeze(result);
@@ -1466,7 +1621,7 @@ var __accessCheck$3 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$2 = (obj, member, getter) => {
+var __privateGet$3 = (obj, member, getter) => {
   __accessCheck$3(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -1475,7 +1630,7 @@ var __privateAdd$3 = (obj, member, value) => {
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
-var __privateSet$1 = (obj, member, value, setter) => {
+var __privateSet$2 = (obj, member, value, setter) => {
   __accessCheck$3(obj, member, "write to private field");
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
@@ -1484,30 +1639,30 @@ var _map;
 class SimpleCache {
   constructor(options = {}) {
     __privateAdd$3(this, _map, void 0);
-    __privateSet$1(this, _map, /* @__PURE__ */ new Map());
+    __privateSet$2(this, _map, /* @__PURE__ */ new Map());
     this.capacity = options.max ?? 500;
     this.cacheRecords = options.cacheRecords ?? true;
     this.defaultQueryTTL = options.defaultQueryTTL ?? 60 * 1e3;
   }
   async getAll() {
-    return Object.fromEntries(__privateGet$2(this, _map));
+    return Object.fromEntries(__privateGet$3(this, _map));
   }
   async get(key) {
-    return __privateGet$2(this, _map).get(key) ?? null;
+    return __privateGet$3(this, _map).get(key) ?? null;
   }
   async set(key, value) {
     await this.delete(key);
-    __privateGet$2(this, _map).set(key, value);
-    if (__privateGet$2(this, _map).size > this.capacity) {
-      const leastRecentlyUsed = __privateGet$2(this, _map).keys().next().value;
+    __privateGet$3(this, _map).set(key, value);
+    if (__privateGet$3(this, _map).size > this.capacity) {
+      const leastRecentlyUsed = __privateGet$3(this, _map).keys().next().value;
       await this.delete(leastRecentlyUsed);
     }
   }
   async delete(key) {
-    __privateGet$2(this, _map).delete(key);
+    __privateGet$3(this, _map).delete(key);
   }
   async clear() {
-    return __privateGet$2(this, _map).clear();
+    return __privateGet$3(this, _map).clear();
   }
 }
 _map = new WeakMap();
@@ -1535,7 +1690,7 @@ var __accessCheck$2 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
-var __privateGet$1 = (obj, member, getter) => {
+var __privateGet$2 = (obj, member, getter) => {
   __accessCheck$2(obj, member, "read from private field");
   return getter ? getter.call(obj) : member.get(obj);
 };
@@ -1546,26 +1701,24 @@ var __privateAdd$2 = (obj, member, value) => {
 };
 var _tables;
 class SchemaPlugin extends XataPlugin {
-  constructor(links, tableNames) {
+  constructor(tableNames) {
     super();
-    this.links = links;
     this.tableNames = tableNames;
     __privateAdd$2(this, _tables, {});
   }
   build(pluginOptions) {
-    const links = this.links;
     const db = new Proxy({}, {
       get: (_target, table) => {
         if (!isString(table))
           throw new Error("Invalid table name");
-        if (!__privateGet$1(this, _tables)[table]) {
-          __privateGet$1(this, _tables)[table] = new RestRepository({ db, pluginOptions, table, links });
+        if (__privateGet$2(this, _tables)[table] === void 0) {
+          __privateGet$2(this, _tables)[table] = new RestRepository({ db, pluginOptions, table });
         }
-        return __privateGet$1(this, _tables)[table];
+        return __privateGet$2(this, _tables)[table];
       }
     });
     for (const table of this.tableNames ?? []) {
-      db[table] = new RestRepository({ db, pluginOptions, table, links });
+      db[table] = new RestRepository({ db, pluginOptions, table });
     }
     return db;
   }
@@ -1576,55 +1729,80 @@ var __accessCheck$1 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
+var __privateGet$1 = (obj, member, getter) => {
+  __accessCheck$1(obj, member, "read from private field");
+  return getter ? getter.call(obj) : member.get(obj);
+};
 var __privateAdd$1 = (obj, member, value) => {
   if (member.has(obj))
     throw TypeError("Cannot add the same private member more than once");
   member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 };
+var __privateSet$1 = (obj, member, value, setter) => {
+  __accessCheck$1(obj, member, "write to private field");
+  setter ? setter.call(obj, value) : member.set(obj, value);
+  return value;
+};
 var __privateMethod$1 = (obj, member, method) => {
   __accessCheck$1(obj, member, "access private method");
   return method;
 };
-var _search, search_fn;
+var _schema, _search, search_fn, _getSchema, getSchema_fn;
 class SearchPlugin extends XataPlugin {
-  constructor(db, links) {
+  constructor(db) {
     super();
     this.db = db;
-    this.links = links;
     __privateAdd$1(this, _search);
+    __privateAdd$1(this, _getSchema);
+    __privateAdd$1(this, _schema, void 0);
   }
   build({ getFetchProps }) {
     return {
       all: async (query, options = {}) => {
         const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
+        const schema = await __privateMethod$1(this, _getSchema, getSchema_fn).call(this, getFetchProps);
         return records.map((record) => {
           const { table = "orphan" } = record.xata;
-          return { table, record: initObject(this.db, this.links, table, record) };
+          return { table, record: initObject(this.db, schema, table, record) };
         });
       },
       byTable: async (query, options = {}) => {
         const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
+        const schema = await __privateMethod$1(this, _getSchema, getSchema_fn).call(this, getFetchProps);
         return records.reduce((acc, record) => {
           const { table = "orphan" } = record.xata;
           const items = acc[table] ?? [];
-          const item = initObject(this.db, this.links, table, record);
+          const item = initObject(this.db, schema, table, record);
           return { ...acc, [table]: [...items, item] };
         }, {});
       }
     };
   }
 }
+_schema = new WeakMap();
 _search = new WeakSet();
 search_fn = async function(query, options, getFetchProps) {
   const fetchProps = await getFetchProps();
-  const { tables, fuzziness } = options ?? {};
+  const { tables, fuzziness, highlight } = options ?? {};
   const { records } = await searchBranch({
     pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}" },
-    body: { tables, query, fuzziness },
+    body: { tables, query, fuzziness, highlight },
     ...fetchProps
   });
   return records;
 };
+_getSchema = new WeakSet();
+getSchema_fn = async function(getFetchProps) {
+  if (__privateGet$1(this, _schema))
+    return __privateGet$1(this, _schema);
+  const fetchProps = await getFetchProps();
+  const { schema } = await getBranchDetails({
+    pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}" },
+    ...fetchProps
+  });
+  __privateSet$1(this, _schema, schema);
+  return schema;
+};
 
 const isBranchStrategyBuilder = (strategy) => {
   return typeof strategy === "function";
@@ -1636,30 +1814,39 @@ const envBranchNames = [
   "CF_PAGES_BRANCH",
   "BRANCH"
 ];
-const defaultBranch = "main";
 async function getCurrentBranchName(options) {
-  const env = await getBranchByEnvVariable();
-  if (env)
-    return env;
-  const branch = await getGitBranch();
-  if (!branch)
-    return defaultBranch;
-  const details = await getDatabaseBranch(branch, options);
-  if (details)
-    return branch;
-  return defaultBranch;
+  const env = getBranchByEnvVariable();
+  if (env) {
+    const details = await getDatabaseBranch(env, options);
+    if (details)
+      return env;
+    console.warn(`Branch ${env} not found in Xata. Ignoring...`);
+  }
+  const gitBranch = await getGitBranch();
+  return resolveXataBranch(gitBranch, options);
 }
 async function getCurrentBranchDetails(options) {
-  const env = await getBranchByEnvVariable();
-  if (env)
-    return getDatabaseBranch(env, options);
-  const branch = await getGitBranch();
-  if (!branch)
-    return getDatabaseBranch(defaultBranch, options);
-  const details = await getDatabaseBranch(branch, options);
-  if (details)
-    return details;
-  return getDatabaseBranch(defaultBranch, options);
+  const branch = await getCurrentBranchName(options);
+  return getDatabaseBranch(branch, options);
+}
+async function resolveXataBranch(gitBranch, options) {
+  const databaseURL = options?.databaseURL || getDatabaseURL();
+  const apiKey = options?.apiKey || getAPIKey();
+  if (!databaseURL)
+    throw new Error("A databaseURL was not defined. Either set the XATA_DATABASE_URL env variable or pass the argument explicitely");
+  if (!apiKey)
+    throw new Error("An API key was not defined. Either set the XATA_API_KEY env variable or pass the argument explicitely");
+  const [protocol, , host, , dbName] = databaseURL.split("/");
+  const [workspace] = host.split(".");
+  const { branch } = await resolveBranch({
+    apiKey,
+    apiUrl: databaseURL,
+    fetchImpl: getFetchImplementation(options?.fetchImpl),
+    workspacesApiUrl: `${protocol}//${host}`,
+    pathParams: { dbName, workspace },
+    queryParams: { gitBranch, fallbackBranch: getEnvVariable("XATA_FALLBACK_BRANCH") }
+  });
+  return branch;
 }
 async function getDatabaseBranch(branch, options) {
   const databaseURL = options?.databaseURL || getDatabaseURL();
@@ -1733,7 +1920,7 @@ var __privateMethod = (obj, member, method) => {
 const buildClient = (plugins) => {
   var _branch, _parseOptions, parseOptions_fn, _getFetchProps, getFetchProps_fn, _evaluateBranch, evaluateBranch_fn, _a;
   return _a = class {
-    constructor(options = {}, links, tables) {
+    constructor(options = {}, tables) {
       __privateAdd(this, _parseOptions);
       __privateAdd(this, _getFetchProps);
       __privateAdd(this, _evaluateBranch);
@@ -1743,12 +1930,12 @@ const buildClient = (plugins) => {
         getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions),
         cache: safeOptions.cache
       };
-      const db = new SchemaPlugin(links, tables).build(pluginOptions);
-      const search = new SearchPlugin(db, links ?? {}).build(pluginOptions);
+      const db = new SchemaPlugin(tables).build(pluginOptions);
+      const search = new SearchPlugin(db).build(pluginOptions);
       this.db = db;
       this.search = search;
       for (const [key, namespace] of Object.entries(plugins ?? {})) {
-        if (!namespace)
+        if (namespace === void 0)
           continue;
         const result = namespace.build(pluginOptions);
         if (result instanceof Promise) {
@@ -1765,7 +1952,7 @@ const buildClient = (plugins) => {
     const databaseURL = options?.databaseURL || getDatabaseURL();
     const apiKey = options?.apiKey || getAPIKey();
     const cache = options?.cache ?? new SimpleCache({ cacheRecords: false, defaultQueryTTL: 0 });
-    const branch = async () => options?.branch ? await __privateMethod(this, _evaluateBranch, evaluateBranch_fn).call(this, options.branch) : await getCurrentBranchName({ apiKey, databaseURL, fetchImpl: options?.fetch });
+    const branch = async () => options?.branch !== void 0 ? await __privateMethod(this, _evaluateBranch, evaluateBranch_fn).call(this, options.branch) : await getCurrentBranchName({ apiKey, databaseURL, fetchImpl: options?.fetch });
     if (!databaseURL || !apiKey) {
       throw new Error("Options databaseURL and apiKey are required");
     }
@@ -1792,7 +1979,7 @@ const buildClient = (plugins) => {
   }, _evaluateBranch = new WeakSet(), evaluateBranch_fn = async function(param) {
     if (__privateGet(this, _branch))
       return __privateGet(this, _branch);
-    if (!param)
+    if (param === void 0)
       return void 0;
     const strategies = Array.isArray(param) ? [...param] : [param];
     const evaluateBranch = async (strategy) => {
@@ -1817,5 +2004,5 @@ class XataError extends Error {
   }
 }
 
-export { BaseClient, operationsByTag as Operations, PAGINATION_DEFAULT_OFFSET, PAGINATION_DEFAULT_SIZE, PAGINATION_MAX_OFFSET, PAGINATION_MAX_SIZE, Page, Query, Repository, RestRepository, SchemaPlugin, SearchPlugin, SimpleCache, XataApiClient, XataApiPlugin, XataError, XataPlugin, acceptWorkspaceMemberInvite, addTableColumn, buildClient, bulkInsertTableRecords, cancelWorkspaceMemberInvite, compareBranchSchema, contains, createBranch, createDatabase, createTable, createUserAPIKey, createWorkspace, deleteBranch, deleteColumn, deleteDatabase, deleteRecord, deleteTable, deleteUser, deleteUserAPIKey, deleteWorkspace, endsWith, executeBranchMigrationPlan, exists, ge, getAPIKey, getBranchDetails, getBranchList, getBranchMetadata, getBranchMigrationHistory, getBranchMigrationPlan, getBranchSchemaHistory, getBranchStats, getColumn, getCurrentBranchDetails, getCurrentBranchName, getDatabaseList, getDatabaseURL, getRecord, getTableColumns, getTableSchema, getUser, getUserAPIKeys, getWorkspace, getWorkspaceMembersList, getWorkspacesList, gt, gte, includes, includesAll, includesAny, includesNone, insertRecord, insertRecordWithID, inviteWorkspaceMember, is, isIdentifiable, isNot, isXataRecord, le, lt, lte, notExists, operationsByTag, pattern, queryTable, removeWorkspaceMember, resendWorkspaceMemberInvite, searchBranch, setTableSchema, startsWith, updateBranchMetadata, updateBranchSchema, updateColumn, updateRecordWithID, updateTable, updateUser, updateWorkspace, updateWorkspaceMemberRole, upsertRecordWithID };
+export { BaseClient, operationsByTag as Operations, PAGINATION_DEFAULT_OFFSET, PAGINATION_DEFAULT_SIZE, PAGINATION_MAX_OFFSET, PAGINATION_MAX_SIZE, Page, Query, RecordArray, Repository, RestRepository, SchemaPlugin, SearchPlugin, SimpleCache, XataApiClient, XataApiPlugin, XataError, XataPlugin, acceptWorkspaceMemberInvite, addGitBranchesEntry, addTableColumn, buildClient, bulkInsertTableRecords, cancelWorkspaceMemberInvite, contains, createBranch, createDatabase, createTable, createUserAPIKey, createWorkspace, deleteBranch, deleteColumn, deleteDatabase, deleteRecord, deleteTable, deleteUser, deleteUserAPIKey, deleteWorkspace, endsWith, executeBranchMigrationPlan, exists, ge, getAPIKey, getBranchDetails, getBranchList, getBranchMetadata, getBranchMigrationHistory, getBranchMigrationPlan, getBranchStats, getColumn, getCurrentBranchDetails, getCurrentBranchName, getDatabaseList, getDatabaseURL, getGitBranchesMapping, getRecord, getTableColumns, getTableSchema, getUser, getUserAPIKeys, getWorkspace, getWorkspaceMembersList, getWorkspacesList, gt, gte, includes, includesAll, includesAny, includesNone, insertRecord, insertRecordWithID, inviteWorkspaceMember, is, isCursorPaginationOptions, isIdentifiable, isNot, isXataRecord, le, lt, lte, notExists, operationsByTag, pattern, queryTable, removeGitBranchesEntry, removeWorkspaceMember, resendWorkspaceMemberInvite, resolveBranch, searchBranch, searchTable, setTableSchema, startsWith, updateBranchMetadata, updateColumn, updateRecordWithID, updateTable, updateUser, updateWorkspace, updateWorkspaceMemberRole, upsertRecordWithID };
 //# sourceMappingURL=index.mjs.map