@xata.io/client 0.8.3 → 0.8.4

package/dist/index.cjs

@@ -16,15 +16,14 @@ function isString(value) {
 }
 
 function getEnvVariable(name) {
-  var _a, _b;
   try {
-    if (isObject(process) && isString((_a = process == null ? void 0 : process.env) == null ? void 0 : _a[name])) {
+    if (isObject(process) && isString(process?.env?.[name])) {
       return process.env[name];
     }
   } catch (err) {
   }
   try {
-    if (isObject(Deno) && isString((_b = Deno == null ? void 0 : Deno.env) == null ? void 0 : _b.get(name))) {
+    if (isObject(Deno) && isString(Deno?.env?.get(name))) {
       return Deno.env.get(name);
     }
   } catch (err) {
@@ -48,99 +47,51 @@ async function getGitBranch() {
   }
 }
 
+function getAPIKey() {
+  try {
+    return getEnvVariable("XATA_API_KEY") ?? XATA_API_KEY;
+  } catch (err) {
+    return void 0;
+  }
+}
+
 function getFetchImplementation(userFetch) {
   const globalFetch = typeof fetch !== "undefined" ? fetch : void 0;
-  const fetchImpl = userFetch != null ? userFetch : globalFetch;
+  const fetchImpl = userFetch ?? globalFetch;
   if (!fetchImpl) {
     throw new Error(`The \`fetch\` option passed to the Xata client is resolving to a falsy value and may not be correctly imported.`);
   }
   return fetchImpl;
 }
 
-const envBranchNames = [
-  "XATA_BRANCH",
-  "VERCEL_GIT_COMMIT_REF",
-  "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;
-}
-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);
-}
-async function getDatabaseBranch(branch, options) {
-  const databaseURL = (options == null ? void 0 : options.databaseURL) || getDatabaseURL();
-  const apiKey = (options == null ? void 0 : 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, , database] = databaseURL.split("/");
-  const [workspace] = host.split(".");
-  const dbBranchName = `${database}:${branch}`;
-  try {
-    return await getBranchDetails({
-      apiKey,
-      apiUrl: databaseURL,
-      fetchImpl: getFetchImplementation(options == null ? void 0 : options.fetchImpl),
-      workspacesApiUrl: `${protocol}//${host}`,
-      pathParams: {
-        dbBranchName,
-        workspace
-      }
-    });
-  } catch (err) {
-    if (isObject(err) && err.status === 404)
-      return null;
-    throw err;
-  }
-}
-function getBranchByEnvVariable() {
-  for (const name of envBranchNames) {
-    const value = getEnvVariable(name);
-    if (value) {
-      return value;
+class FetcherError extends Error {
+  constructor(status, data) {
+    super(getMessage(data));
+    this.status = status;
+    this.errors = isBulkError(data) ? data.errors : void 0;
+    if (data instanceof Error) {
+      this.stack = data.stack;
+      this.cause = data.cause;
     }
   }
-  try {
-    return XATA_BRANCH;
-  } catch (err) {
-  }
 }
-function getDatabaseURL() {
-  var _a;
-  try {
-    return (_a = getEnvVariable("XATA_DATABASE_URL")) != null ? _a : XATA_DATABASE_URL;
-  } catch (err) {
-    return void 0;
-  }
+function isBulkError(error) {
+  return isObject(error) && Array.isArray(error.errors);
 }
-function getAPIKey() {
-  var _a;
-  try {
-    return (_a = getEnvVariable("XATA_API_KEY")) != null ? _a : XATA_API_KEY;
-  } catch (err) {
-    return void 0;
+function isErrorWithMessage(error) {
+  return isObject(error) && isString(error.message);
+}
+function getMessage(data) {
+  if (data instanceof Error) {
+    return data.message;
+  } else if (isString(data)) {
+    return data;
+  } else if (isErrorWithMessage(data)) {
+    return data.message;
+  } else if (isBulkError(data)) {
+    return "Bulk operation failed";
+  } else {
+    return "Unexpected error";
   }
 }
 
@@ -155,16 +106,15 @@ function buildBaseUrl({
   apiUrl,
   pathParams
 }) {
-  if (!(pathParams == null ? void 0 : pathParams.workspace))
+  if (!pathParams?.workspace)
     return `${apiUrl}${path}`;
   const url = typeof workspacesApiUrl === "string" ? `${workspacesApiUrl}${path}` : workspacesApiUrl(path, pathParams);
   return url.replace("{workspaceId}", pathParams.workspace);
 }
 function hostHeader(url) {
-  var _a;
   const pattern = /.*:\/\/(?<host>[^/]+).*/;
-  const { groups } = (_a = pattern.exec(url)) != null ? _a : {};
-  return (groups == null ? void 0 : groups.host) ? { Host: groups.host } : {};
+  const { groups } = pattern.exec(url) ?? {};
+  return groups?.host ? { Host: groups.host } : {};
 }
 async function fetch$1({
   url: path,
@@ -199,33 +149,20 @@ async function fetch$1({
     if (response.ok) {
       return jsonResponse;
     }
-    const { message = "Unknown error", errors } = jsonResponse;
-    throw new FetcherError({ message, status: response.status, errors });
+    throw new FetcherError(response.status, jsonResponse);
   } catch (error) {
-    const message = hasMessage(error) ? error.message : "Unknown network error";
-    const parent = error instanceof Error ? error : void 0;
-    throw new FetcherError({ message, status: response.status }, parent);
-  }
-}
-const hasMessage = (error) => {
-  return isObject(error) && isString(error.message);
-};
-class FetcherError extends Error {
-  constructor(data, parent) {
-    super(data.message);
-    this.status = data.status;
-    this.errors = data.errors;
-    if (parent) {
-      this.stack = parent.stack;
-      this.cause = parent.cause;
-    }
+    throw new FetcherError(response.status, error);
   }
 }
 
 const getUser = (variables) => fetch$1({ url: "/user", method: "get", ...variables });
 const updateUser = (variables) => fetch$1({ url: "/user", method: "put", ...variables });
 const deleteUser = (variables) => fetch$1({ url: "/user", method: "delete", ...variables });
-const getUserAPIKeys = (variables) => fetch$1({ url: "/user/keys", method: "get", ...variables });
+const getUserAPIKeys = (variables) => fetch$1({
+  url: "/user/keys",
+  method: "get",
+  ...variables
+});
 const createUserAPIKey = (variables) => fetch$1({
   url: "/user/keys/{keyName}",
   method: "post",
@@ -236,8 +173,16 @@ const deleteUserAPIKey = (variables) => fetch$1({
   method: "delete",
   ...variables
 });
-const createWorkspace = (variables) => fetch$1({ url: "/workspaces", method: "post", ...variables });
-const getWorkspacesList = (variables) => fetch$1({ url: "/workspaces", method: "get", ...variables });
+const createWorkspace = (variables) => fetch$1({
+  url: "/workspaces",
+  method: "post",
+  ...variables
+});
+const getWorkspacesList = (variables) => fetch$1({
+  url: "/workspaces",
+  method: "get",
+  ...variables
+});
 const getWorkspace = (variables) => fetch$1({
   url: "/workspaces/{workspaceId}",
   method: "get",
@@ -258,21 +203,13 @@ const getWorkspaceMembersList = (variables) => fetch$1({
   method: "get",
   ...variables
 });
-const updateWorkspaceMemberRole = (variables) => fetch$1({
-  url: "/workspaces/{workspaceId}/members/{userId}",
-  method: "put",
-  ...variables
-});
+const updateWorkspaceMemberRole = (variables) => fetch$1({ url: "/workspaces/{workspaceId}/members/{userId}", method: "put", ...variables });
 const removeWorkspaceMember = (variables) => fetch$1({
   url: "/workspaces/{workspaceId}/members/{userId}",
   method: "delete",
   ...variables
 });
-const inviteWorkspaceMember = (variables) => fetch$1({
-  url: "/workspaces/{workspaceId}/invites",
-  method: "post",
-  ...variables
-});
+const inviteWorkspaceMember = (variables) => fetch$1({ url: "/workspaces/{workspaceId}/invites", method: "post", ...variables });
 const cancelWorkspaceMemberInvite = (variables) => fetch$1({
   url: "/workspaces/{workspaceId}/invites/{inviteId}",
   method: "delete",
@@ -334,16 +271,8 @@ const getBranchMetadata = (variables) => fetch$1({
   ...variables
 });
 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 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 getBranchStats = (variables) => fetch$1({
   url: "/db/{dbBranchName}/stats",
   method: "get",
@@ -417,11 +346,7 @@ const getRecord = (variables) => fetch$1({
   method: "get",
   ...variables
 });
-const bulkInsertTableRecords = (variables) => fetch$1({
-  url: "/db/{dbBranchName}/tables/{tableName}/bulk",
-  method: "post",
-  ...variables
-});
+const bulkInsertTableRecords = (variables) => fetch$1({ url: "/db/{dbBranchName}/tables/{tableName}/bulk", method: "post", ...variables });
 const queryTable = (variables) => fetch$1({
   url: "/db/{dbBranchName}/tables/{tableName}/query",
   method: "post",
@@ -531,12 +456,11 @@ var __privateSet$4 = (obj, member, value, setter) => {
 };
 var _extraProps, _namespaces;
 class XataApiClient {
-  constructor(options) {
+  constructor(options = {}) {
     __privateAdd$6(this, _extraProps, void 0);
     __privateAdd$6(this, _namespaces, {});
-    var _a, _b;
-    const provider = (_a = options.host) != null ? _a : "production";
-    const apiKey = (_b = options == null ? void 0 : options.apiKey) != null ? _b : getAPIKey();
+    const provider = options.host ?? "production";
+    const apiKey = options?.apiKey ?? getAPIKey();
     if (!apiKey) {
       throw new Error("Could not resolve a valid apiKey");
     }
@@ -1004,21 +928,20 @@ const _Query = class {
     __privateAdd$4(this, _data, { filter: {} });
     this.meta = { page: { cursor: "start", more: true } };
     this.records = [];
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     __privateSet$2(this, _table$1, table);
     if (repository) {
       __privateSet$2(this, _repository, repository);
     } else {
       __privateSet$2(this, _repository, this);
     }
-    __privateGet$3(this, _data).filter = (_b = (_a = data.filter) != null ? _a : parent == null ? void 0 : parent.filter) != null ? _b : {};
-    __privateGet$3(this, _data).filter.$any = (_e = (_c = data.filter) == null ? void 0 : _c.$any) != null ? _e : (_d = parent == null ? void 0 : parent.filter) == null ? void 0 : _d.$any;
-    __privateGet$3(this, _data).filter.$all = (_h = (_f = data.filter) == null ? void 0 : _f.$all) != null ? _h : (_g = parent == null ? void 0 : parent.filter) == null ? void 0 : _g.$all;
-    __privateGet$3(this, _data).filter.$not = (_k = (_i = data.filter) == null ? void 0 : _i.$not) != null ? _k : (_j = parent == null ? void 0 : parent.filter) == null ? void 0 : _j.$not;
-    __privateGet$3(this, _data).filter.$none = (_n = (_l = data.filter) == null ? void 0 : _l.$none) != null ? _n : (_m = parent == null ? void 0 : parent.filter) == null ? void 0 : _m.$none;
-    __privateGet$3(this, _data).sort = (_o = data.sort) != null ? _o : parent == null ? void 0 : parent.sort;
-    __privateGet$3(this, _data).columns = (_q = (_p = data.columns) != null ? _p : parent == null ? void 0 : parent.columns) != null ? _q : ["*"];
-    __privateGet$3(this, _data).page = (_r = data.page) != null ? _r : parent == null ? void 0 : parent.page;
+    __privateGet$3(this, _data).filter = data.filter ?? parent?.filter ?? {};
+    __privateGet$3(this, _data).filter.$any = data.filter?.$any ?? parent?.filter?.$any;
+    __privateGet$3(this, _data).filter.$all = data.filter?.$all ?? parent?.filter?.$all;
+    __privateGet$3(this, _data).filter.$not = data.filter?.$not ?? parent?.filter?.$not;
+    __privateGet$3(this, _data).filter.$none = data.filter?.$none ?? parent?.filter?.$none;
+    __privateGet$3(this, _data).sort = data.sort ?? parent?.sort;
+    __privateGet$3(this, _data).columns = data.columns ?? parent?.columns ?? ["*"];
+    __privateGet$3(this, _data).page = data.page ?? parent?.page;
     this.any = this.any.bind(this);
     this.all = this.all.bind(this);
     this.not = this.not.bind(this);
@@ -1032,47 +955,33 @@ const _Query = class {
     return __privateGet$3(this, _data);
   }
   any(...queries) {
-    const $any = queries.map((query) => {
-      var _a;
-      return (_a = query.getQueryOptions().filter) != null ? _a : {};
-    });
+    const $any = queries.map((query) => query.getQueryOptions().filter ?? {});
     return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $any } }, __privateGet$3(this, _data));
   }
   all(...queries) {
-    const $all = queries.map((query) => {
-      var _a;
-      return (_a = query.getQueryOptions().filter) != null ? _a : {};
-    });
+    const $all = queries.map((query) => query.getQueryOptions().filter ?? {});
     return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $all } }, __privateGet$3(this, _data));
   }
   not(...queries) {
-    const $not = queries.map((query) => {
-      var _a;
-      return (_a = query.getQueryOptions().filter) != null ? _a : {};
-    });
+    const $not = queries.map((query) => query.getQueryOptions().filter ?? {});
     return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $not } }, __privateGet$3(this, _data));
   }
   none(...queries) {
-    const $none = queries.map((query) => {
-      var _a;
-      return (_a = query.getQueryOptions().filter) != null ? _a : {};
-    });
+    const $none = queries.map((query) => query.getQueryOptions().filter ?? {});
     return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $none } }, __privateGet$3(this, _data));
   }
   filter(a, b) {
-    var _a, _b;
     if (arguments.length === 1) {
       const constraints = Object.entries(a).map(([column, constraint]) => ({ [column]: constraint }));
-      const $all = compact([(_a = __privateGet$3(this, _data).filter) == null ? void 0 : _a.$all].flat().concat(constraints));
+      const $all = compact([__privateGet$3(this, _data).filter?.$all].flat().concat(constraints));
       return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $all } }, __privateGet$3(this, _data));
     } else {
-      const $all = compact([(_b = __privateGet$3(this, _data).filter) == null ? void 0 : _b.$all].flat().concat([{ [a]: b }]));
+      const $all = compact([__privateGet$3(this, _data).filter?.$all].flat().concat([{ [a]: b }]));
       return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { filter: { $all } }, __privateGet$3(this, _data));
     }
   }
   sort(column, direction) {
-    var _a;
-    const originalSort = [(_a = __privateGet$3(this, _data).sort) != null ? _a : []].flat();
+    const originalSort = [__privateGet$3(this, _data).sort ?? []].flat();
     const sort = [...originalSort, { column, direction }];
     return new _Query(__privateGet$3(this, _repository), __privateGet$3(this, _table$1), { sort }, __privateGet$3(this, _data));
   }
@@ -1135,11 +1044,10 @@ _repository = new WeakMap();
 _data = new WeakMap();
 
 function isIdentifiable(x) {
-  return isObject(x) && isString(x == null ? void 0 : x.id);
+  return isObject(x) && isString(x?.id);
 }
 function isXataRecord(x) {
-  var _a;
-  return isIdentifiable(x) && typeof (x == null ? void 0 : x.xata) === "object" && typeof ((_a = x == null ? void 0 : x.xata) == null ? void 0 : _a.version) === "number";
+  return isIdentifiable(x) && typeof x?.xata === "object" && typeof x?.xata?.version === "number";
 }
 
 function isSortFilterString(value) {
@@ -1152,7 +1060,6 @@ function isSortFilterObject(filter) {
   return isObject(filter) && !isSortFilterBase(filter) && filter.column !== void 0;
 }
 function buildSortFilter(filter) {
-  var _a;
   if (isSortFilterString(filter)) {
     return { [filter]: "asc" };
   } else if (Array.isArray(filter)) {
@@ -1160,7 +1067,7 @@ function buildSortFilter(filter) {
   } else if (isSortFilterBase(filter)) {
     return filter;
   } else if (isSortFilterObject(filter)) {
-    return { [filter.column]: (_a = filter.direction) != null ? _a : "asc" };
+    return { [filter.column]: filter.direction ?? "asc" };
   } else {
     throw new Error(`Invalid sort filter: ${filter}`);
   }
@@ -1188,7 +1095,7 @@ var __privateMethod$2 = (obj, member, method) => {
   __accessCheck$3(obj, member, "access private method");
   return method;
 };
-var _table, _links, _getFetchProps, _insertRecordWithoutId, insertRecordWithoutId_fn, _insertRecordWithId, insertRecordWithId_fn, _bulkInsertTableRecords, bulkInsertTableRecords_fn, _updateRecordWithID, updateRecordWithID_fn, _upsertRecordWithID, upsertRecordWithID_fn, _deleteRecord, deleteRecord_fn, _initObject, initObject_fn;
+var _table, _links, _getFetchProps, _insertRecordWithoutId, insertRecordWithoutId_fn, _insertRecordWithId, insertRecordWithId_fn, _bulkInsertTableRecords, bulkInsertTableRecords_fn, _updateRecordWithID, updateRecordWithID_fn, _upsertRecordWithID, upsertRecordWithID_fn, _deleteRecord, deleteRecord_fn;
 class Repository extends Query {
 }
 class RestRepository extends Query {
@@ -1200,13 +1107,11 @@ class RestRepository extends Query {
     __privateAdd$3(this, _updateRecordWithID);
     __privateAdd$3(this, _upsertRecordWithID);
     __privateAdd$3(this, _deleteRecord);
-    __privateAdd$3(this, _initObject);
     __privateAdd$3(this, _table, void 0);
     __privateAdd$3(this, _links, void 0);
     __privateAdd$3(this, _getFetchProps, void 0);
-    var _a;
     __privateSet$1(this, _table, options.table);
-    __privateSet$1(this, _links, (_a = options.links) != null ? _a : {});
+    __privateSet$1(this, _links, options.links ?? {});
     __privateSet$1(this, _getFetchProps, options.getFetchProps);
     this.db = options.db;
   }
@@ -1236,7 +1141,7 @@ class RestRepository extends Query {
         pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", tableName: __privateGet$2(this, _table), recordId },
         ...fetchProps
       });
-      return __privateMethod$2(this, _initObject, initObject_fn).call(this, __privateGet$2(this, _table), response);
+      return initObject(this.db, __privateGet$2(this, _links), __privateGet$2(this, _table), response);
     } catch (e) {
       if (isObject(e) && e.status === 404) {
         return null;
@@ -1299,13 +1204,12 @@ class RestRepository extends Query {
       body: { tables: [__privateGet$2(this, _table)], query, fuzziness: options.fuzziness },
       ...fetchProps
     });
-    return records.map((item) => __privateMethod$2(this, _initObject, initObject_fn).call(this, __privateGet$2(this, _table), item));
+    return records.map((item) => initObject(this.db, __privateGet$2(this, _links), __privateGet$2(this, _table), item));
   }
   async query(query) {
-    var _a;
     const data = query.getQueryOptions();
     const body = {
-      filter: Object.values((_a = data.filter) != null ? _a : {}).some(Boolean) ? data.filter : void 0,
+      filter: Object.values(data.filter ?? {}).some(Boolean) ? data.filter : void 0,
       sort: data.sort ? buildSortFilter(data.sort) : void 0,
       page: data.page,
       columns: data.columns
@@ -1316,7 +1220,7 @@ class RestRepository extends Query {
       body,
       ...fetchProps
     });
-    const records = objects.map((record) => __privateMethod$2(this, _initObject, initObject_fn).call(this, __privateGet$2(this, _table), record));
+    const records = objects.map((record) => initObject(this.db, __privateGet$2(this, _links), __privateGet$2(this, _table), record));
     return new Page(query, meta, records);
   }
 }
@@ -1413,19 +1317,24 @@ deleteRecord_fn = async function(recordId) {
     ...fetchProps
   });
 };
-_initObject = new WeakSet();
-initObject_fn = function(table, object) {
+const transformObjectLinks = (object) => {
+  return Object.entries(object).reduce((acc, [key, value]) => {
+    if (key === "xata")
+      return acc;
+    return { ...acc, [key]: isIdentifiable(value) ? value.id : value };
+  }, {});
+};
+const initObject = (db, links, table, object) => {
   const result = {};
   Object.assign(result, object);
-  const tableLinks = __privateGet$2(this, _links)[table] || [];
+  const tableLinks = links[table] || [];
   for (const link of tableLinks) {
     const [field, linkTable] = link;
     const value = result[field];
     if (value && isObject(value)) {
-      result[field] = __privateMethod$2(this, _initObject, initObject_fn).call(this, linkTable, value);
+      result[field] = initObject(db, links, linkTable, value);
     }
   }
-  const db = this.db;
   result.read = function() {
     return db[table].read(result["id"]);
   };
@@ -1441,13 +1350,6 @@ initObject_fn = function(table, object) {
   Object.freeze(result);
   return result;
 };
-const transformObjectLinks = (object) => {
-  return Object.entries(object).reduce((acc, [key, value]) => {
-    if (key === "xata")
-      return acc;
-    return { ...acc, [key]: isIdentifiable(value) ? value.id : value };
-  }, {});
-};
 
 const gt = (value) => ({ $gt: value });
 const ge = (value) => ({ $ge: value });
@@ -1520,8 +1422,10 @@ var __privateMethod$1 = (obj, member, method) => {
 };
 var _search, search_fn;
 class SearchPlugin extends XataPlugin {
-  constructor() {
-    super(...arguments);
+  constructor(db, links) {
+    super();
+    this.db = db;
+    this.links = links;
     __privateAdd$1(this, _search);
   }
   build({ getFetchProps }) {
@@ -1530,16 +1434,16 @@ class SearchPlugin extends XataPlugin {
         const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
         return records.map((record) => {
           const { table = "orphan" } = record.xata;
-          return { table, record };
+          return { table, record: initObject(this.db, this.links, table, record) };
         });
       },
       byTable: async (query, options = {}) => {
         const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
         return records.reduce((acc, record) => {
-          var _a;
           const { table = "orphan" } = record.xata;
-          const items = (_a = acc[table]) != null ? _a : [];
-          return { ...acc, [table]: [...items, record] };
+          const items = acc[table] ?? [];
+          const item = initObject(this.db, this.links, table, record);
+          return { ...acc, [table]: [...items, item] };
         }, {});
       }
     };
@@ -1548,7 +1452,7 @@ class SearchPlugin extends XataPlugin {
 _search = new WeakSet();
 search_fn = async function(query, options, getFetchProps) {
   const fetchProps = await getFetchProps();
-  const { tables, fuzziness } = options != null ? options : {};
+  const { tables, fuzziness } = options ?? {};
   const { records } = await searchBranch({
     pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}" },
     body: { tables, query, fuzziness },
@@ -1561,6 +1465,84 @@ const isBranchStrategyBuilder = (strategy) => {
   return typeof strategy === "function";
 };
 
+const envBranchNames = [
+  "XATA_BRANCH",
+  "VERCEL_GIT_COMMIT_REF",
+  "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;
+}
+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);
+}
+async function getDatabaseBranch(branch, 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, , database] = databaseURL.split("/");
+  const [workspace] = host.split(".");
+  const dbBranchName = `${database}:${branch}`;
+  try {
+    return await getBranchDetails({
+      apiKey,
+      apiUrl: databaseURL,
+      fetchImpl: getFetchImplementation(options?.fetchImpl),
+      workspacesApiUrl: `${protocol}//${host}`,
+      pathParams: {
+        dbBranchName,
+        workspace
+      }
+    });
+  } catch (err) {
+    if (isObject(err) && err.status === 404)
+      return null;
+    throw err;
+  }
+}
+function getBranchByEnvVariable() {
+  for (const name of envBranchNames) {
+    const value = getEnvVariable(name);
+    if (value) {
+      return value;
+    }
+  }
+  try {
+    return XATA_BRANCH;
+  } catch (err) {
+  }
+}
+function getDatabaseURL() {
+  try {
+    return getEnvVariable("XATA_DATABASE_URL") ?? XATA_DATABASE_URL;
+  } catch (err) {
+    return void 0;
+  }
+}
+
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
@@ -1592,12 +1574,13 @@ const buildClient = (plugins) => {
       __privateAdd(this, _evaluateBranch);
       __privateAdd(this, _branch, void 0);
       const safeOptions = __privateMethod(this, _parseOptions, parseOptions_fn).call(this, options);
-      const namespaces = {
-        db: new SchemaPlugin(links),
-        search: new SearchPlugin(),
-        ...plugins
-      };
-      for (const [key, namespace] of Object.entries(namespaces)) {
+      const db = new SchemaPlugin(links).build({ getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions) });
+      const search = new SearchPlugin(db, links ?? {}).build({
+        getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions)
+      });
+      this.db = db;
+      this.search = search;
+      for (const [key, namespace] of Object.entries(plugins ?? {})) {
         if (!namespace)
           continue;
         const result = namespace.build({ getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions) });
@@ -1611,10 +1594,10 @@ const buildClient = (plugins) => {
       }
     }
   }, _branch = new WeakMap(), _parseOptions = new WeakSet(), parseOptions_fn = function(options) {
-    const fetch = getFetchImplementation(options == null ? void 0 : options.fetch);
-    const databaseURL = (options == null ? void 0 : options.databaseURL) || getDatabaseURL();
-    const apiKey = (options == null ? void 0 : options.apiKey) || getAPIKey();
-    const branch = async () => (options == null ? void 0 : options.branch) ? await __privateMethod(this, _evaluateBranch, evaluateBranch_fn).call(this, options.branch) : await getCurrentBranchName({ apiKey, databaseURL, fetchImpl: options == null ? void 0 : options.fetch });
+    const fetch = getFetchImplementation(options?.fetch);
+    const databaseURL = options?.databaseURL || getDatabaseURL();
+    const apiKey = options?.apiKey || getAPIKey();
+    const branch = async () => options?.branch ? 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");
     }
@@ -1633,8 +1616,7 @@ const buildClient = (plugins) => {
       apiKey,
       apiUrl: "",
       workspacesApiUrl: (path, params) => {
-        var _a2;
-        const hasBranch = (_a2 = params.dbBranchName) != null ? _a2 : params.branch;
+        const hasBranch = params.dbBranchName ?? params.branch;
         const newPath = path.replace(/^\/db\/[^/]+/, hasBranch ? `:${branchValue}` : "");
         return databaseURL + newPath;
       }