@xata.io/client 0.22.3 → 0.23.0

package/dist/index.cjs

@@ -93,8 +93,7 @@ function getEnvironment() {
         apiKey: process.env.XATA_API_KEY ?? getGlobalApiKey(),
         databaseURL: process.env.XATA_DATABASE_URL ?? getGlobalDatabaseURL(),
         branch: process.env.XATA_BRANCH ?? getGlobalBranch(),
-        envBranch: process.env.VERCEL_GIT_COMMIT_REF ?? process.env.CF_PAGES_BRANCH ?? process.env.BRANCH,
-        fallbackBranch: process.env.XATA_FALLBACK_BRANCH ?? getGlobalFallbackBranch()
+        envBranch: process.env.VERCEL_GIT_COMMIT_REF ?? process.env.CF_PAGES_BRANCH ?? process.env.BRANCH
       };
     }
   } catch (err) {
@@ -105,8 +104,7 @@ function getEnvironment() {
         apiKey: Deno.env.get("XATA_API_KEY") ?? getGlobalApiKey(),
         databaseURL: Deno.env.get("XATA_DATABASE_URL") ?? getGlobalDatabaseURL(),
         branch: Deno.env.get("XATA_BRANCH") ?? getGlobalBranch(),
-        envBranch: Deno.env.get("VERCEL_GIT_COMMIT_REF") ?? Deno.env.get("CF_PAGES_BRANCH") ?? Deno.env.get("BRANCH"),
-        fallbackBranch: Deno.env.get("XATA_FALLBACK_BRANCH") ?? getGlobalFallbackBranch()
+        envBranch: Deno.env.get("VERCEL_GIT_COMMIT_REF") ?? Deno.env.get("CF_PAGES_BRANCH") ?? Deno.env.get("BRANCH")
       };
     }
   } catch (err) {
@@ -115,8 +113,7 @@ function getEnvironment() {
     apiKey: getGlobalApiKey(),
     databaseURL: getGlobalDatabaseURL(),
     branch: getGlobalBranch(),
-    envBranch: void 0,
-    fallbackBranch: getGlobalFallbackBranch()
+    envBranch: void 0
   };
 }
 function getEnableBrowserVariable() {
@@ -159,37 +156,26 @@ function getGlobalBranch() {
     return void 0;
   }
 }
-function getGlobalFallbackBranch() {
+function getDatabaseURL() {
   try {
-    return XATA_FALLBACK_BRANCH;
+    const { databaseURL } = getEnvironment();
+    return databaseURL;
   } catch (err) {
     return void 0;
   }
 }
-async function getGitBranch() {
-  const cmd = ["git", "branch", "--show-current"];
-  const fullCmd = cmd.join(" ");
-  const nodeModule = ["child", "process"].join("_");
-  const execOptions = { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] };
-  try {
-    if (typeof require === "function") {
-      return require(nodeModule).execSync(fullCmd, execOptions).trim();
-    }
-  } catch (err) {
-  }
+function getAPIKey() {
   try {
-    if (isObject(Deno)) {
-      const process2 = Deno.run({ cmd, stdout: "piped", stderr: "null" });
-      return new TextDecoder().decode(await process2.output()).trim();
-    }
+    const { apiKey } = getEnvironment();
+    return apiKey;
   } catch (err) {
+    return void 0;
   }
 }
-
-function getAPIKey() {
+function getBranch() {
   try {
-    const { apiKey } = getEnvironment();
-    return apiKey;
+    const { branch, envBranch } = getEnvironment();
+    return branch ?? envBranch;
   } catch (err) {
     return void 0;
   }
@@ -302,7 +288,180 @@ function generateUUID() {
   });
 }
 
-const VERSION = "0.22.3";
+async function getBytes(stream, onChunk) {
+  const reader = stream.getReader();
+  let result;
+  while (!(result = await reader.read()).done) {
+    onChunk(result.value);
+  }
+}
+function getLines(onLine) {
+  let buffer;
+  let position;
+  let fieldLength;
+  let discardTrailingNewline = false;
+  return function onChunk(arr) {
+    if (buffer === void 0) {
+      buffer = arr;
+      position = 0;
+      fieldLength = -1;
+    } else {
+      buffer = concat(buffer, arr);
+    }
+    const bufLength = buffer.length;
+    let lineStart = 0;
+    while (position < bufLength) {
+      if (discardTrailingNewline) {
+        if (buffer[position] === 10 /* NewLine */) {
+          lineStart = ++position;
+        }
+        discardTrailingNewline = false;
+      }
+      let lineEnd = -1;
+      for (; position < bufLength && lineEnd === -1; ++position) {
+        switch (buffer[position]) {
+          case 58 /* Colon */:
+            if (fieldLength === -1) {
+              fieldLength = position - lineStart;
+            }
+            break;
+          case 13 /* CarriageReturn */:
+            discardTrailingNewline = true;
+          case 10 /* NewLine */:
+            lineEnd = position;
+            break;
+        }
+      }
+      if (lineEnd === -1) {
+        break;
+      }
+      onLine(buffer.subarray(lineStart, lineEnd), fieldLength);
+      lineStart = position;
+      fieldLength = -1;
+    }
+    if (lineStart === bufLength) {
+      buffer = void 0;
+    } else if (lineStart !== 0) {
+      buffer = buffer.subarray(lineStart);
+      position -= lineStart;
+    }
+  };
+}
+function getMessages(onId, onRetry, onMessage) {
+  let message = newMessage();
+  const decoder = new TextDecoder();
+  return function onLine(line, fieldLength) {
+    if (line.length === 0) {
+      onMessage?.(message);
+      message = newMessage();
+    } else if (fieldLength > 0) {
+      const field = decoder.decode(line.subarray(0, fieldLength));
+      const valueOffset = fieldLength + (line[fieldLength + 1] === 32 /* Space */ ? 2 : 1);
+      const value = decoder.decode(line.subarray(valueOffset));
+      switch (field) {
+        case "data":
+          message.data = message.data ? message.data + "\n" + value : value;
+          break;
+        case "event":
+          message.event = value;
+          break;
+        case "id":
+          onId(message.id = value);
+          break;
+        case "retry":
+          const retry = parseInt(value, 10);
+          if (!isNaN(retry)) {
+            onRetry(message.retry = retry);
+          }
+          break;
+      }
+    }
+  };
+}
+function concat(a, b) {
+  const res = new Uint8Array(a.length + b.length);
+  res.set(a);
+  res.set(b, a.length);
+  return res;
+}
+function newMessage() {
+  return {
+    data: "",
+    event: "",
+    id: "",
+    retry: void 0
+  };
+}
+const EventStreamContentType = "text/event-stream";
+const LastEventId = "last-event-id";
+function fetchEventSource(input, {
+  signal: inputSignal,
+  headers: inputHeaders,
+  onopen: inputOnOpen,
+  onmessage,
+  onclose,
+  onerror,
+  fetch: inputFetch,
+  ...rest
+}) {
+  return new Promise((resolve, reject) => {
+    const headers = { ...inputHeaders };
+    if (!headers.accept) {
+      headers.accept = EventStreamContentType;
+    }
+    let curRequestController;
+    function dispose() {
+      curRequestController.abort();
+    }
+    inputSignal?.addEventListener("abort", () => {
+      dispose();
+      resolve();
+    });
+    const fetchImpl = inputFetch ?? fetch;
+    const onopen = inputOnOpen ?? defaultOnOpen;
+    async function create() {
+      curRequestController = new AbortController();
+      try {
+        const response = await fetchImpl(input, {
+          ...rest,
+          headers,
+          signal: curRequestController.signal
+        });
+        await onopen(response);
+        await getBytes(
+          response.body,
+          getLines(
+            getMessages(
+              (id) => {
+                if (id) {
+                  headers[LastEventId] = id;
+                } else {
+                  delete headers[LastEventId];
+                }
+              },
+              (_retry) => {
+              },
+              onmessage
+            )
+          )
+        );
+        onclose?.();
+        dispose();
+        resolve();
+      } catch (err) {
+      }
+    }
+    create();
+  });
+}
+function defaultOnOpen(response) {
+  const contentType = response.headers?.get("content-type");
+  if (!contentType?.startsWith(EventStreamContentType)) {
+    throw new Error(`Expected content-type to be ${EventStreamContentType}, Actual: ${contentType}`);
+  }
+}
+
+const VERSION = "0.23.0";
 
 class ErrorWithCause extends Error {
   constructor(message, options) {
@@ -386,7 +545,7 @@ async function fetch$1({
   headers: customHeaders,
   pathParams,
   queryParams,
-  fetchImpl,
+  fetch: fetch2,
   apiKey,
   endpoint,
   apiUrl,
@@ -399,7 +558,7 @@ async function fetch$1({
   xataAgentExtra,
   fetchOptions = {}
 }) {
-  pool.setFetch(fetchImpl);
+  pool.setFetch(fetch2);
   return await trace(
     `${method.toUpperCase()} ${path}`,
     async ({ setAttributes }) => {
@@ -461,6 +620,59 @@ async function fetch$1({
     { [TraceAttributes.HTTP_METHOD]: method.toUpperCase(), [TraceAttributes.HTTP_ROUTE]: path }
   );
 }
+function fetchSSERequest({
+  url: path,
+  method,
+  body,
+  headers: customHeaders,
+  pathParams,
+  queryParams,
+  fetch: fetch2,
+  apiKey,
+  endpoint,
+  apiUrl,
+  workspacesApiUrl,
+  onMessage,
+  onError,
+  onClose,
+  signal,
+  clientID,
+  sessionID,
+  clientName,
+  xataAgentExtra
+}) {
+  const baseUrl = buildBaseUrl({ endpoint, path, workspacesApiUrl, pathParams, apiUrl });
+  const fullUrl = resolveUrl(baseUrl, queryParams, pathParams);
+  const url = fullUrl.includes("localhost") ? fullUrl.replace(/^[^.]+\./, "http://") : fullUrl;
+  void fetchEventSource(url, {
+    method,
+    body: JSON.stringify(body),
+    fetch: fetch2,
+    signal,
+    headers: {
+      "X-Xata-Client-ID": clientID ?? defaultClientID,
+      "X-Xata-Session-ID": sessionID ?? generateUUID(),
+      "X-Xata-Agent": compact([
+        ["client", "TS_SDK"],
+        ["version", VERSION],
+        isDefined(clientName) ? ["service", clientName] : void 0,
+        ...Object.entries(xataAgentExtra ?? {})
+      ]).map(([key, value]) => `${key}=${value}`).join("; "),
+      ...customHeaders,
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json"
+    },
+    onmessage(ev) {
+      onMessage?.(JSON.parse(ev.data));
+    },
+    onerror(ev) {
+      onError?.(JSON.parse(ev.data));
+    },
+    onclose() {
+      onClose?.();
+    }
+  });
+}
 function parseUrl(url) {
   try {
     const { host, protocol } = new URL(url);
@@ -491,6 +703,12 @@ const deleteBranch = (variables, signal) => dataPlaneFetch({
   ...variables,
   signal
 });
+const copyBranch = (variables, signal) => dataPlaneFetch({
+  url: "/db/{dbBranchName}/copy",
+  method: "post",
+  ...variables,
+  signal
+});
 const updateBranchMetadata = (variables, signal) => dataPlaneFetch({
   url: "/db/{dbBranchName}/metadata",
   method: "put",
@@ -540,6 +758,7 @@ const compareBranchSchemas = (variables, signal) => dataPlaneFetch({ url: "/db/{
 const updateBranchSchema = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/schema/update", method: "post", ...variables, signal });
 const previewBranchSchemaEdit = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/schema/preview", method: "post", ...variables, signal });
 const applyBranchSchemaEdit = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/schema/apply", method: "post", ...variables, signal });
+const pushBranchMigrations = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/schema/push", method: "post", ...variables, signal });
 const createTable = (variables, signal) => dataPlaneFetch({
   url: "/db/{dbBranchName}/tables/{tableName}",
   method: "put",
@@ -614,6 +833,12 @@ const searchTable = (variables, signal) => dataPlaneFetch({
   signal
 });
 const vectorSearchTable = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/tables/{tableName}/vectorSearch", method: "post", ...variables, signal });
+const askTable = (variables, signal) => dataPlaneFetch({
+  url: "/db/{dbBranchName}/tables/{tableName}/ask",
+  method: "post",
+  ...variables,
+  signal
+});
 const summarizeTable = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/tables/{tableName}/summarize", method: "post", ...variables, signal });
 const aggregateTable = (variables, signal) => dataPlaneFetch({ url: "/db/{dbBranchName}/tables/{tableName}/aggregate", method: "post", ...variables, signal });
 const operationsByTag$2 = {
@@ -622,6 +847,7 @@ const operationsByTag$2 = {
     getBranchDetails,
     createBranch,
     deleteBranch,
+    copyBranch,
     updateBranchMetadata,
     getBranchMetadata,
     getBranchStats,
@@ -639,7 +865,8 @@ const operationsByTag$2 = {
     compareBranchSchemas,
     updateBranchSchema,
     previewBranchSchemaEdit,
-    applyBranchSchemaEdit
+    applyBranchSchemaEdit,
+    pushBranchMigrations
   },
   migrationRequests: {
     queryMigrationRequests,
@@ -673,7 +900,15 @@ const operationsByTag$2 = {
     deleteRecord,
     bulkInsertTableRecords
   },
-  searchAndFilter: { queryTable, searchBranch, searchTable, vectorSearchTable, summarizeTable, aggregateTable }
+  searchAndFilter: {
+    queryTable,
+    searchBranch,
+    searchTable,
+    vectorSearchTable,
+    askTable,
+    summarizeTable,
+    aggregateTable
+  }
 };
 
 const controlPlaneFetch = async (options) => fetch$1({ ...options, endpoint: "controlPlane" });
@@ -832,6 +1067,10 @@ const providers = {
   staging: {
     main: "https://api.staging-xata.dev",
     workspaces: "https://{workspaceId}.{region}.staging-xata.dev"
+  },
+  dev: {
+    main: "https://api.dev-xata.dev",
+    workspaces: "https://{workspaceId}.{region}.dev-xata.dev"
   }
 };
 function isHostProviderAlias(alias) {
@@ -849,6 +1088,11 @@ function parseProviderString(provider = "production") {
     return null;
   return { main, workspaces };
 }
+function buildProviderString(provider) {
+  if (isHostProviderAlias(provider))
+    return provider;
+  return `${provider.main},${provider.workspaces}`;
+}
 function parseWorkspacesUrlParts(url) {
   if (!isString(url))
     return null;
@@ -895,7 +1139,7 @@ class XataApiClient {
     __privateSet$7(this, _extraProps, {
       apiUrl: getHostUrl(provider, "main"),
       workspacesApiUrl: getHostUrl(provider, "workspaces"),
-      fetchImpl: getFetchImplementation(options.fetch),
+      fetch: getFetchImplementation(options.fetch),
       apiKey,
       trace,
       clientName: options.clientName,
@@ -1161,6 +1405,20 @@ class BranchApi {
       ...this.extraProps
     });
   }
+  copyBranch({
+    workspace,
+    region,
+    database,
+    branch,
+    destinationBranch,
+    limit
+  }) {
+    return operationsByTag.branch.copyBranch({
+      pathParams: { workspace, region, dbBranchName: `${database}:${branch}` },
+      body: { destinationBranch, limit },
+      ...this.extraProps
+    });
+  }
   updateBranchMetadata({
     workspace,
     region,
@@ -1575,6 +1833,38 @@ class SearchAndFilterApi {
       ...this.extraProps
     });
   }
+  vectorSearchTable({
+    workspace,
+    region,
+    database,
+    branch,
+    table,
+    queryVector,
+    column,
+    similarityFunction,
+    size,
+    filter
+  }) {
+    return operationsByTag.searchAndFilter.vectorSearchTable({
+      pathParams: { workspace, region, dbBranchName: `${database}:${branch}`, tableName: table },
+      body: { queryVector, column, similarityFunction, size, filter },
+      ...this.extraProps
+    });
+  }
+  askTable({
+    workspace,
+    region,
+    database,
+    branch,
+    table,
+    options
+  }) {
+    return operationsByTag.searchAndFilter.askTable({
+      pathParams: { workspace, region, dbBranchName: `${database}:${branch}`, tableName: table },
+      body: { ...options },
+      ...this.extraProps
+    });
+  }
   summarizeTable({
     workspace,
     region,
@@ -1839,6 +2129,19 @@ class MigrationsApi {
       ...this.extraProps
     });
   }
+  pushBranchMigrations({
+    workspace,
+    region,
+    database,
+    branch,
+    migrations
+  }) {
+    return operationsByTag.migrations.pushBranchMigrations({
+      pathParams: { workspace, region, dbBranchName: `${database}:${branch}` },
+      body: { migrations },
+      ...this.extraProps
+    });
+  }
 }
 class DatabaseApi {
   constructor(extraProps) {
@@ -1928,9 +2231,8 @@ class DatabaseApi {
 }
 
 class XataApiPlugin {
-  async build(options) {
-    const { fetchImpl, apiKey } = await options.getFetchProps();
-    return new XataApiClient({ fetch: fetchImpl, apiKey });
+  build(options) {
+    return new XataApiClient(options);
   }
 }
 
@@ -2344,10 +2646,7 @@ class RestRepository extends Query {
     __privateSet$4(this, _db, options.db);
     __privateSet$4(this, _cache, options.pluginOptions.cache);
     __privateSet$4(this, _schemaTables$2, options.schemaTables);
-    __privateSet$4(this, _getFetchProps, async () => {
-      const props = await options.pluginOptions.getFetchProps();
-      return { ...props, sessionID: generateUUID() };
-    });
+    __privateSet$4(this, _getFetchProps, () => ({ ...options.pluginOptions, sessionID: generateUUID() }));
     const trace = options.pluginOptions.trace ?? defaultTrace;
     __privateSet$4(this, _trace, async (name, fn, options2 = {}) => {
       return trace(name, fn, {
@@ -2404,7 +2703,6 @@ class RestRepository extends Query {
       }
       const id = extractId(a);
       if (id) {
-        const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
         try {
           const response = await getRecord({
             pathParams: {
@@ -2415,7 +2713,7 @@ class RestRepository extends Query {
               recordId: id
             },
             queryParams: { columns },
-            ...fetchProps
+            ...__privateGet$4(this, _getFetchProps).call(this)
           });
           const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
           return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
@@ -2593,7 +2891,6 @@ class RestRepository extends Query {
   }
   async search(query, options = {}) {
     return __privateGet$4(this, _trace).call(this, "search", async () => {
-      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
       const { records } = await searchTable({
         pathParams: {
           workspace: "{workspaceId}",
@@ -2611,7 +2908,7 @@ class RestRepository extends Query {
           page: options.page,
           target: options.target
         },
-        ...fetchProps
+        ...__privateGet$4(this, _getFetchProps).call(this)
       });
       const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
       return records.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item, ["*"]));
@@ -2619,7 +2916,6 @@ class RestRepository extends Query {
   }
   async vectorSearch(column, query, options) {
     return __privateGet$4(this, _trace).call(this, "vectorSearch", async () => {
-      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
       const { records } = await vectorSearchTable({
         pathParams: {
           workspace: "{workspaceId}",
@@ -2634,7 +2930,7 @@ class RestRepository extends Query {
           size: options?.size,
           filter: options?.filter
         },
-        ...fetchProps
+        ...__privateGet$4(this, _getFetchProps).call(this)
       });
       const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
       return records.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item, ["*"]));
@@ -2642,7 +2938,6 @@ class RestRepository extends Query {
   }
   async aggregate(aggs, filter) {
     return __privateGet$4(this, _trace).call(this, "aggregate", async () => {
-      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
       const result = await aggregateTable({
         pathParams: {
           workspace: "{workspaceId}",
@@ -2651,7 +2946,7 @@ class RestRepository extends Query {
           tableName: __privateGet$4(this, _table)
         },
         body: { aggs, filter },
-        ...fetchProps
+        ...__privateGet$4(this, _getFetchProps).call(this)
       });
       return result;
     });
@@ -2662,7 +2957,6 @@ class RestRepository extends Query {
       if (cacheQuery)
         return new Page(query, cacheQuery.meta, cacheQuery.records);
       const data = query.getQueryOptions();
-      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
       const { meta, records: objects } = await queryTable({
         pathParams: {
           workspace: "{workspaceId}",
@@ -2678,7 +2972,7 @@ class RestRepository extends Query {
           consistency: data.consistency
         },
         fetchOptions: data.fetchOptions,
-        ...fetchProps
+        ...__privateGet$4(this, _getFetchProps).call(this)
       });
       const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
       const records = objects.map(
@@ -2691,7 +2985,6 @@ class RestRepository extends Query {
   async summarizeTable(query, summaries, summariesFilter) {
     return __privateGet$4(this, _trace).call(this, "summarize", async () => {
       const data = query.getQueryOptions();
-      const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
       const result = await summarizeTable({
         pathParams: {
           workspace: "{workspaceId}",
@@ -2708,11 +3001,39 @@ class RestRepository extends Query {
           summaries,
           summariesFilter
         },
-        ...fetchProps
+        ...__privateGet$4(this, _getFetchProps).call(this)
       });
       return result;
     });
   }
+  ask(question, options) {
+    const params = {
+      pathParams: {
+        workspace: "{workspaceId}",
+        dbBranchName: "{dbBranch}",
+        region: "{region}",
+        tableName: __privateGet$4(this, _table)
+      },
+      body: {
+        question,
+        ...options
+      },
+      ...__privateGet$4(this, _getFetchProps).call(this)
+    };
+    if (options?.onMessage) {
+      fetchSSERequest({
+        endpoint: "dataPlane",
+        url: "/db/{dbBranchName}/tables/{tableName}/ask",
+        method: "POST",
+        onMessage: (message) => {
+          options.onMessage?.({ answer: message.text });
+        },
+        ...params
+      });
+    } else {
+      return askTable(params);
+    }
+  }
 }
 _table = new WeakMap();
 _getFetchProps = new WeakMap();
@@ -2722,7 +3043,6 @@ _schemaTables$2 = new WeakMap();
 _trace = new WeakMap();
 _insertRecordWithoutId = new WeakSet();
 insertRecordWithoutId_fn = async function(object, columns = ["*"]) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const record = transformObjectLinks(object);
   const response = await insertRecord({
     pathParams: {
@@ -2733,14 +3053,13 @@ insertRecordWithoutId_fn = async function(object, columns = ["*"]) {
     },
     queryParams: { columns },
     body: record,
-    ...fetchProps
+    ...__privateGet$4(this, _getFetchProps).call(this)
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
   return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _insertRecordWithId = new WeakSet();
 insertRecordWithId_fn = async function(recordId, object, columns = ["*"], { createOnly, ifVersion }) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const record = transformObjectLinks(object);
   const response = await insertRecordWithID({
     pathParams: {
@@ -2752,14 +3071,13 @@ insertRecordWithId_fn = async function(recordId, object, columns = ["*"], { crea
     },
     body: record,
     queryParams: { createOnly, columns, ifVersion },
-    ...fetchProps
+    ...__privateGet$4(this, _getFetchProps).call(this)
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
   return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _insertRecords = new WeakSet();
 insertRecords_fn = async function(objects, { createOnly, ifVersion }) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const chunkedOperations = chunk(
     objects.map((object) => ({
       insert: { table: __privateGet$4(this, _table), record: transformObjectLinks(object), createOnly, ifVersion }
@@ -2775,7 +3093,7 @@ insertRecords_fn = async function(objects, { createOnly, ifVersion }) {
         region: "{region}"
       },
       body: { operations },
-      ...fetchProps
+      ...__privateGet$4(this, _getFetchProps).call(this)
     });
     for (const result of results) {
       if (result.operation === "insert") {
@@ -2789,7 +3107,6 @@ insertRecords_fn = async function(objects, { createOnly, ifVersion }) {
 };
 _updateRecordWithID = new WeakSet();
 updateRecordWithID_fn = async function(recordId, object, columns = ["*"], { ifVersion }) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const { id: _id, ...record } = transformObjectLinks(object);
   try {
     const response = await updateRecordWithID({
@@ -2802,7 +3119,7 @@ updateRecordWithID_fn = async function(recordId, object, columns = ["*"], { ifVe
       },
       queryParams: { columns, ifVersion },
       body: record,
-      ...fetchProps
+      ...__privateGet$4(this, _getFetchProps).call(this)
     });
     const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
     return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
@@ -2815,7 +3132,6 @@ updateRecordWithID_fn = async function(recordId, object, columns = ["*"], { ifVe
 };
 _updateRecords = new WeakSet();
 updateRecords_fn = async function(objects, { ifVersion, upsert }) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const chunkedOperations = chunk(
     objects.map(({ id, ...object }) => ({
       update: { table: __privateGet$4(this, _table), id, ifVersion, upsert, fields: transformObjectLinks(object) }
@@ -2831,7 +3147,7 @@ updateRecords_fn = async function(objects, { ifVersion, upsert }) {
         region: "{region}"
       },
       body: { operations },
-      ...fetchProps
+      ...__privateGet$4(this, _getFetchProps).call(this)
     });
     for (const result of results) {
       if (result.operation === "update") {
@@ -2845,7 +3161,6 @@ updateRecords_fn = async function(objects, { ifVersion, upsert }) {
 };
 _upsertRecordWithID = new WeakSet();
 upsertRecordWithID_fn = async function(recordId, object, columns = ["*"], { ifVersion }) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const response = await upsertRecordWithID({
     pathParams: {
       workspace: "{workspaceId}",
@@ -2856,14 +3171,13 @@ upsertRecordWithID_fn = async function(recordId, object, columns = ["*"], { ifVe
     },
     queryParams: { columns, ifVersion },
     body: object,
-    ...fetchProps
+    ...__privateGet$4(this, _getFetchProps).call(this)
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
   return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _deleteRecord = new WeakSet();
 deleteRecord_fn = async function(recordId, columns = ["*"]) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   try {
     const response = await deleteRecord({
       pathParams: {
@@ -2874,7 +3188,7 @@ deleteRecord_fn = async function(recordId, columns = ["*"]) {
         recordId
       },
       queryParams: { columns },
-      ...fetchProps
+      ...__privateGet$4(this, _getFetchProps).call(this)
     });
     const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
     return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
@@ -2887,7 +3201,6 @@ deleteRecord_fn = async function(recordId, columns = ["*"]) {
 };
 _deleteRecords = new WeakSet();
 deleteRecords_fn = async function(recordIds) {
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const chunkedOperations = chunk(
     recordIds.map((id) => ({ delete: { table: __privateGet$4(this, _table), id } })),
     BULK_OPERATION_MAX_SIZE
@@ -2900,21 +3213,22 @@ deleteRecords_fn = async function(recordIds) {
         region: "{region}"
       },
       body: { operations },
-      ...fetchProps
+      ...__privateGet$4(this, _getFetchProps).call(this)
     });
   }
 };
 _setCacheQuery = new WeakSet();
 setCacheQuery_fn = async function(query, meta, records) {
-  await __privateGet$4(this, _cache).set(`query_${__privateGet$4(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$4(this, _table)}:${query.key()}`;
-  const result = await __privateGet$4(this, _cache).get(key);
+  const result = await __privateGet$4(this, _cache)?.get(key);
   if (!result)
     return null;
-  const { cache: ttl = __privateGet$4(this, _cache).defaultQueryTTL } = query.getQueryOptions();
+  const defaultTTL = __privateGet$4(this, _cache)?.defaultQueryTTL ?? -1;
+  const { cache: ttl = defaultTTL } = query.getQueryOptions();
   if (ttl < 0)
     return null;
   const hasExpired = result.date.getTime() + ttl < Date.now();
@@ -2924,10 +3238,9 @@ _getSchemaTables$1 = new WeakSet();
 getSchemaTables_fn$1 = async function() {
   if (__privateGet$4(this, _schemaTables$2))
     return __privateGet$4(this, _schemaTables$2);
-  const fetchProps = await __privateGet$4(this, _getFetchProps).call(this);
   const { schema } = await getBranchDetails({
     pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", region: "{region}" },
-    ...fetchProps
+    ...__privateGet$4(this, _getFetchProps).call(this)
   });
   __privateSet$4(this, _schemaTables$2, schema.tables);
   return schema.tables;
@@ -3203,19 +3516,19 @@ class SearchPlugin extends XataPlugin {
     __privateAdd$1(this, _schemaTables, void 0);
     __privateSet$1(this, _schemaTables, schemaTables);
   }
-  build({ getFetchProps }) {
+  build(pluginOptions) {
     return {
       all: async (query, options = {}) => {
-        const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
-        const schemaTables = await __privateMethod$1(this, _getSchemaTables, getSchemaTables_fn).call(this, getFetchProps);
+        const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, pluginOptions);
+        const schemaTables = await __privateMethod$1(this, _getSchemaTables, getSchemaTables_fn).call(this, pluginOptions);
         return records.map((record) => {
           const { table = "orphan" } = record.xata;
           return { table, record: initObject(this.db, schemaTables, table, record, ["*"]) };
         });
       },
       byTable: async (query, options = {}) => {
-        const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, getFetchProps);
-        const schemaTables = await __privateMethod$1(this, _getSchemaTables, getSchemaTables_fn).call(this, getFetchProps);
+        const records = await __privateMethod$1(this, _search, search_fn).call(this, query, options, pluginOptions);
+        const schemaTables = await __privateMethod$1(this, _getSchemaTables, getSchemaTables_fn).call(this, pluginOptions);
         return records.reduce((acc, record) => {
           const { table = "orphan" } = record.xata;
           const items = acc[table] ?? [];
@@ -3228,38 +3541,35 @@ class SearchPlugin extends XataPlugin {
 }
 _schemaTables = new WeakMap();
 _search = new WeakSet();
-search_fn = async function(query, options, getFetchProps) {
-  const fetchProps = await getFetchProps();
+search_fn = async function(query, options, pluginOptions) {
   const { tables, fuzziness, highlight, prefix, page } = options ?? {};
   const { records } = await searchBranch({
     pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", region: "{region}" },
     body: { tables, query, fuzziness, prefix, highlight, page },
-    ...fetchProps
+    ...pluginOptions
   });
   return records;
 };
 _getSchemaTables = new WeakSet();
-getSchemaTables_fn = async function(getFetchProps) {
+getSchemaTables_fn = async function(pluginOptions) {
   if (__privateGet$1(this, _schemaTables))
     return __privateGet$1(this, _schemaTables);
-  const fetchProps = await getFetchProps();
   const { schema } = await getBranchDetails({
     pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", region: "{region}" },
-    ...fetchProps
+    ...pluginOptions
   });
   __privateSet$1(this, _schemaTables, schema.tables);
   return schema.tables;
 };
 
 class TransactionPlugin extends XataPlugin {
-  build({ getFetchProps }) {
+  build(pluginOptions) {
     return {
       run: async (operations) => {
-        const fetchProps = await getFetchProps();
         const response = await branchTransaction({
           pathParams: { workspace: "{workspaceId}", dbBranchName: "{dbBranch}", region: "{region}" },
           body: { operations },
-          ...fetchProps
+          ...pluginOptions
         });
         return response;
       }
@@ -3267,91 +3577,6 @@ class TransactionPlugin extends XataPlugin {
   }
 }
 
-const isBranchStrategyBuilder = (strategy) => {
-  return typeof strategy === "function";
-};
-
-async function getCurrentBranchName(options) {
-  const { branch, envBranch } = getEnvironment();
-  if (branch)
-    return branch;
-  const gitBranch = envBranch || await getGitBranch();
-  return resolveXataBranch(gitBranch, options);
-}
-async function getCurrentBranchDetails(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 urlParts = parseWorkspacesUrlParts(host);
-  if (!urlParts)
-    throw new Error(`Unable to parse workspace and region: ${databaseURL}`);
-  const { workspace, region } = urlParts;
-  const { fallbackBranch } = getEnvironment();
-  const { branch } = await resolveBranch({
-    apiKey,
-    apiUrl: databaseURL,
-    fetchImpl: getFetchImplementation(options?.fetchImpl),
-    workspacesApiUrl: `${protocol}//${host}`,
-    pathParams: { dbName, workspace, region },
-    queryParams: { gitBranch, fallbackBranch },
-    trace: defaultTrace,
-    clientName: options?.clientName,
-    xataAgentExtra: options?.xataAgentExtra
-  });
-  return branch;
-}
-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 urlParts = parseWorkspacesUrlParts(host);
-  if (!urlParts)
-    throw new Error(`Unable to parse workspace and region: ${databaseURL}`);
-  const { workspace, region } = urlParts;
-  try {
-    return await getBranchDetails({
-      apiKey,
-      apiUrl: databaseURL,
-      fetchImpl: getFetchImplementation(options?.fetchImpl),
-      workspacesApiUrl: `${protocol}//${host}`,
-      pathParams: { dbBranchName: `${database}:${branch}`, workspace, region },
-      trace: defaultTrace
-    });
-  } catch (err) {
-    if (isObject(err) && err.status === 404)
-      return null;
-    throw err;
-  }
-}
-function getDatabaseURL() {
-  try {
-    const { databaseURL } = getEnvironment();
-    return databaseURL;
-  } catch (err) {
-    return void 0;
-  }
-}
-
 var __accessCheck = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
@@ -3375,20 +3600,18 @@ var __privateMethod = (obj, member, method) => {
   return method;
 };
 const buildClient = (plugins) => {
-  var _branch, _options, _parseOptions, parseOptions_fn, _getFetchProps, getFetchProps_fn, _evaluateBranch, evaluateBranch_fn, _a;
+  var _options, _parseOptions, parseOptions_fn, _getFetchProps, getFetchProps_fn, _a;
   return _a = class {
     constructor(options = {}, schemaTables) {
       __privateAdd(this, _parseOptions);
       __privateAdd(this, _getFetchProps);
-      __privateAdd(this, _evaluateBranch);
-      __privateAdd(this, _branch, void 0);
       __privateAdd(this, _options, void 0);
       const safeOptions = __privateMethod(this, _parseOptions, parseOptions_fn).call(this, options);
       __privateSet(this, _options, safeOptions);
       const pluginOptions = {
-        getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions),
+        ...__privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions),
         cache: safeOptions.cache,
-        trace: safeOptions.trace
+        host: safeOptions.host
       };
       const db = new SchemaPlugin(schemaTables).build(pluginOptions);
       const search = new SearchPlugin(db, schemaTables).build(pluginOptions);
@@ -3399,22 +3622,15 @@ const buildClient = (plugins) => {
       for (const [key, namespace] of Object.entries(plugins ?? {})) {
         if (namespace === void 0)
           continue;
-        const result = namespace.build(pluginOptions);
-        if (result instanceof Promise) {
-          void result.then((namespace2) => {
-            this[key] = namespace2;
-          });
-        } else {
-          this[key] = result;
-        }
+        this[key] = namespace.build(pluginOptions);
       }
     }
     async getConfig() {
       const databaseURL = __privateGet(this, _options).databaseURL;
-      const branch = await __privateGet(this, _options).branch();
+      const branch = __privateGet(this, _options).branch;
       return { databaseURL, branch };
     }
-  }, _branch = new WeakMap(), _options = new WeakMap(), _parseOptions = new WeakSet(), parseOptions_fn = function(options) {
+  }, _options = new WeakMap(), _parseOptions = new WeakSet(), parseOptions_fn = function(options) {
     const enableBrowser = options?.enableBrowser ?? getEnableBrowserVariable() ?? false;
     const isBrowser = typeof window !== "undefined" && typeof Deno === "undefined";
     if (isBrowser && !enableBrowser) {
@@ -3424,18 +3640,13 @@ const buildClient = (plugins) => {
     }
     const fetch = getFetchImplementation(options?.fetch);
     const databaseURL = options?.databaseURL || getDatabaseURL();
+    const branch = options?.branch || getBranch() || "main";
     const apiKey = options?.apiKey || getAPIKey();
     const cache = options?.cache ?? new SimpleCache({ defaultQueryTTL: 0 });
     const trace = options?.trace ?? defaultTrace;
     const clientName = options?.clientName;
+    const host = options?.host ?? "production";
     const xataAgentExtra = options?.xataAgentExtra;
-    const branch = async () => options?.branch !== void 0 ? await __privateMethod(this, _evaluateBranch, evaluateBranch_fn).call(this, options.branch) : await getCurrentBranchName({
-      apiKey,
-      databaseURL,
-      fetchImpl: options?.fetch,
-      clientName,
-      xataAgentExtra
-    });
     if (!apiKey) {
       throw new Error("Option apiKey is required");
     }
@@ -3449,12 +3660,13 @@ const buildClient = (plugins) => {
       branch,
       cache,
       trace,
+      host,
       clientID: generateUUID(),
       enableBrowser,
       clientName,
       xataAgentExtra
     };
-  }, _getFetchProps = new WeakSet(), getFetchProps_fn = async function({
+  }, _getFetchProps = new WeakSet(), getFetchProps_fn = function({
     fetch,
     apiKey,
     databaseURL,
@@ -3464,16 +3676,13 @@ const buildClient = (plugins) => {
     clientName,
     xataAgentExtra
   }) {
-    const branchValue = await __privateMethod(this, _evaluateBranch, evaluateBranch_fn).call(this, branch);
-    if (!branchValue)
-      throw new Error("Unable to resolve branch value");
     return {
-      fetchImpl: fetch,
+      fetch,
       apiKey,
       apiUrl: "",
       workspacesApiUrl: (path, params) => {
         const hasBranch = params.dbBranchName ?? params.branch;
-        const newPath = path.replace(/^\/db\/[^/]+/, hasBranch !== void 0 ? `:${branchValue}` : "");
+        const newPath = path.replace(/^\/db\/[^/]+/, hasBranch !== void 0 ? `:${branch}` : "");
         return databaseURL + newPath;
       },
       trace,
@@ -3481,22 +3690,6 @@ const buildClient = (plugins) => {
       clientName,
       xataAgentExtra
     };
-  }, _evaluateBranch = new WeakSet(), evaluateBranch_fn = async function(param) {
-    if (__privateGet(this, _branch))
-      return __privateGet(this, _branch);
-    if (param === void 0)
-      return void 0;
-    const strategies = Array.isArray(param) ? [...param] : [param];
-    const evaluateBranch = async (strategy) => {
-      return isBranchStrategyBuilder(strategy) ? await strategy() : strategy;
-    };
-    for await (const strategy of strategies) {
-      const branch = await evaluateBranch(strategy);
-      if (branch) {
-        __privateSet(this, _branch, branch);
-        return branch;
-      }
-    }
   }, _a;
 };
 class BaseClient extends buildClient() {
@@ -3616,8 +3809,10 @@ exports.addGitBranchesEntry = addGitBranchesEntry;
 exports.addTableColumn = addTableColumn;
 exports.aggregateTable = aggregateTable;
 exports.applyBranchSchemaEdit = applyBranchSchemaEdit;
+exports.askTable = askTable;
 exports.branchTransaction = branchTransaction;
 exports.buildClient = buildClient;
+exports.buildProviderString = buildProviderString;
 exports.buildWorkerRunner = buildWorkerRunner;
 exports.bulkInsertTableRecords = bulkInsertTableRecords;
 exports.cancelWorkspaceMemberInvite = cancelWorkspaceMemberInvite;
@@ -3625,6 +3820,7 @@ exports.compareBranchSchemas = compareBranchSchemas;
 exports.compareBranchWithUserSchema = compareBranchWithUserSchema;
 exports.compareMigrationRequest = compareMigrationRequest;
 exports.contains = contains;
+exports.copyBranch = copyBranch;
 exports.createBranch = createBranch;
 exports.createDatabase = createDatabase;
 exports.createMigrationRequest = createMigrationRequest;
@@ -3647,6 +3843,7 @@ exports.executeBranchMigrationPlan = executeBranchMigrationPlan;
 exports.exists = exists;
 exports.ge = ge;
 exports.getAPIKey = getAPIKey;
+exports.getBranch = getBranch;
 exports.getBranchDetails = getBranchDetails;
 exports.getBranchList = getBranchList;
 exports.getBranchMetadata = getBranchMetadata;
@@ -3655,8 +3852,6 @@ exports.getBranchMigrationPlan = getBranchMigrationPlan;
 exports.getBranchSchemaHistory = getBranchSchemaHistory;
 exports.getBranchStats = getBranchStats;
 exports.getColumn = getColumn;
-exports.getCurrentBranchDetails = getCurrentBranchDetails;
-exports.getCurrentBranchName = getCurrentBranchName;
 exports.getDatabaseGithubSettings = getDatabaseGithubSettings;
 exports.getDatabaseList = getDatabaseList;
 exports.getDatabaseMetadata = getDatabaseMetadata;
@@ -3707,6 +3902,7 @@ exports.parseProviderString = parseProviderString;
 exports.parseWorkspacesUrlParts = parseWorkspacesUrlParts;
 exports.pattern = pattern;
 exports.previewBranchSchemaEdit = previewBranchSchemaEdit;
+exports.pushBranchMigrations = pushBranchMigrations;
 exports.queryMigrationRequests = queryMigrationRequests;
 exports.queryTable = queryTable;
 exports.removeGitBranchesEntry = removeGitBranchesEntry;