@xata.io/client 0.21.1 → 0.21.3

package/dist/index.d.ts

@@ -5790,9 +5790,6 @@ type RequiredBy<T, K extends keyof T> = T & {
     [P in K]-?: NonNullable<T[P]>;
 };
 type GetArrayInnerType<T extends readonly any[]> = T[number];
-type FunctionKeys<T> = {
-    [K in keyof T]: T[K] extends (...args: any) => any ? K : never;
-}[keyof T];
 type SingleOrArray<T> = T | T[];
 type Dictionary<T> = Record<string, T>;
 type OmitBy<T, K extends keyof T> = T extends any ? Omit<T, K> : never;
@@ -6397,6 +6394,7 @@ type SummarizeResultItem<Record extends XataRecord, Expression extends Dictionar
 
 type BaseOptions<T extends XataRecord> = {
     columns?: SelectableColumn<T>[];
+    consistency?: 'strong' | 'eventual';
     cache?: number;
     fetchOptions?: Record<string, unknown>;
 };
@@ -7698,14 +7696,13 @@ declare class Serializer {
 }
 declare const serialize: <T>(data: T) => string;
 declare const deserialize: <T>(json: string) => T;
-type SerializerResult<T> = T extends Record<string, any> ? Omit<{
-    [K in keyof T]: SerializerResult<T[K]>;
-}, FunctionKeys<T>> : T;
+type SerializerResult<T> = T extends XataRecord ? EditableData<T> : T extends any[] ? SerializerResult<T[number]>[] : T;
 
 type BranchResolutionOptions = {
     databaseURL?: string;
     apiKey?: string;
     fetchImpl?: FetchImpl;
+    clientName?: string;
 };
 declare function getCurrentBranchName(options?: BranchResolutionOptions): Promise<string>;
 declare function getCurrentBranchDetails(options?: BranchResolutionOptions): Promise<DBBranch | null>;
@@ -7791,7 +7788,7 @@ type WorkerRunnerConfig = {
     workspace: string;
     worker: string;
 };
-declare function buildWorkerRunner<XataClient>(config: WorkerRunnerConfig): <WorkerFunction extends (ctx: XataWorkerContext<XataClient>, ...args: any[]) => any>(name: string, _worker: WorkerFunction) => (...args: RemoveFirst<Parameters<WorkerFunction>>) => Promise<SerializerResult<Awaited<ReturnType<WorkerFunction>>>>;
+declare function buildWorkerRunner<XataClient>(config: WorkerRunnerConfig): <WorkerFunction extends (ctx: XataWorkerContext<XataClient>, ...args: any[]) => any>(name: string, worker: WorkerFunction) => (...args: RemoveFirst<Parameters<WorkerFunction>>) => Promise<SerializerResult<Awaited<ReturnType<WorkerFunction>>>>;
 
 declare class XataError extends Error {
     readonly status: number;

package/dist/index.mjs

@@ -295,7 +295,14 @@ enqueue_fn = function(task) {
   return promise;
 };
 
-const VERSION = "0.21.1";
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
+
+const VERSION = "0.21.3";
 
 class ErrorWithCause extends Error {
   constructor(message, options) {
@@ -306,7 +313,7 @@ class FetcherError extends ErrorWithCause {
   constructor(status, data, requestId) {
     super(getMessage(data));
     this.status = status;
-    this.errors = isBulkError(data) ? data.errors : void 0;
+    this.errors = isBulkError(data) ? data.errors : [{ message: getMessage(data), status }];
     this.requestId = requestId;
     if (data instanceof Error) {
       this.stack = data.stack;
@@ -371,11 +378,12 @@ function hostHeader(url) {
   const { groups } = pattern.exec(url) ?? {};
   return groups?.host ? { Host: groups.host } : {};
 }
+const defaultClientID = generateUUID();
 async function fetch$1({
   url: path,
   method,
   body,
-  headers,
+  headers: customHeaders,
   pathParams,
   queryParams,
   fetchImpl,
@@ -406,20 +414,21 @@ async function fetch$1({
         ["version", VERSION],
         isDefined(clientName) ? ["service", clientName] : void 0
       ]).map(([key, value]) => `${key}=${value}`).join("; ");
+      const headers = {
+        "Accept-Encoding": "identity",
+        "Content-Type": "application/json",
+        "X-Xata-Client-ID": clientID ?? defaultClientID,
+        "X-Xata-Session-ID": sessionID ?? generateUUID(),
+        "X-Xata-Agent": xataAgent,
+        ...customHeaders,
+        ...hostHeader(fullUrl),
+        Authorization: `Bearer ${apiKey}`
+      };
       const response = await pool.request(url, {
         ...fetchOptions,
         method: method.toUpperCase(),
         body: body ? JSON.stringify(body) : void 0,
-        headers: {
-          "Accept-Encoding": "identity",
-          "Content-Type": "application/json",
-          "X-Xata-Client-ID": clientID ?? "",
-          "X-Xata-Session-ID": sessionID ?? "",
-          "X-Xata-Agent": xataAgent,
-          ...headers,
-          ...hostHeader(fullUrl),
-          Authorization: `Bearer ${apiKey}`
-        },
+        headers,
         signal
       });
       const { host, protocol } = parseUrl(response.url);
@@ -846,12 +855,12 @@ function parseProviderString(provider = "production") {
 function parseWorkspacesUrlParts(url) {
   if (!isString(url))
     return null;
-  const regex = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))?\.xata\.sh.*/;
-  const regexStaging = /(?:https:\/\/)?([^.]+)\.staging(?:\.([^.]+))?\.xatabase\.co.*/;
+  const regex = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.xata\.sh.*/;
+  const regexStaging = /(?:https:\/\/)?([^.]+)\.staging(?:\.([^.]+))\.xatabase\.co.*/;
   const match = url.match(regex) || url.match(regexStaging);
   if (!match)
     return null;
-  return { workspace: match[1], region: match[2] ?? "eu-west-1" };
+  return { workspace: match[1], region: match[2] };
 }
 
 var __accessCheck$7 = (obj, member, msg) => {
@@ -880,6 +889,7 @@ class XataApiClient {
     const provider = options.host ?? "production";
     const apiKey = options.apiKey ?? getAPIKey();
     const trace = options.trace ?? defaultTrace;
+    const clientID = generateUUID();
     if (!apiKey) {
       throw new Error("Could not resolve a valid apiKey");
     }
@@ -889,7 +899,8 @@ class XataApiClient {
       fetchImpl: getFetchImplementation(options.fetch),
       apiKey,
       trace,
-      clientName: options.clientName
+      clientName: options.clientName,
+      clientID
     });
   }
   get user() {
@@ -1894,13 +1905,6 @@ class XataApiPlugin {
 class XataPlugin {
 }
 
-function generateUUID() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-}
-
 function cleanFilter(filter) {
   if (!filter)
     return void 0;
@@ -2048,6 +2052,7 @@ const _Query = class {
     __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).consistency = data.consistency ?? parent?.consistency;
     __privateGet$5(this, _data).pagination = data.pagination ?? parent?.pagination;
     __privateGet$5(this, _data).cache = data.cache ?? parent?.cache;
     __privateGet$5(this, _data).fetchOptions = data.fetchOptions ?? parent?.fetchOptions;
@@ -2608,7 +2613,8 @@ class RestRepository extends Query {
           filter: cleanFilter(data.filter),
           sort: data.sort !== void 0 ? buildSortFilter(data.sort) : void 0,
           page: data.pagination,
-          columns: data.columns ?? ["*"]
+          columns: data.columns ?? ["*"],
+          consistency: data.consistency
         },
         fetchOptions: data.fetchOptions,
         ...fetchProps
@@ -2636,6 +2642,7 @@ class RestRepository extends Query {
           filter: cleanFilter(data.filter),
           sort: data.sort !== void 0 ? buildSortFilter(data.sort) : void 0,
           columns: data.columns,
+          consistency: data.consistency,
           page: data.pagination?.size !== void 0 ? { size: data.pagination?.size } : void 0,
           summaries,
           summariesFilter
@@ -3198,12 +3205,8 @@ const isBranchStrategyBuilder = (strategy) => {
 
 async function getCurrentBranchName(options) {
   const { branch, envBranch } = getEnvironment();
-  if (branch) {
-    const details = await getDatabaseBranch(branch, options);
-    if (details)
-      return branch;
-    console.warn(`Branch ${branch} not found in Xata. Ignoring...`);
-  }
+  if (branch)
+    return branch;
   const gitBranch = envBranch || await getGitBranch();
   return resolveXataBranch(gitBranch, options);
 }
@@ -3235,7 +3238,8 @@ async function resolveXataBranch(gitBranch, options) {
     workspacesApiUrl: `${protocol}//${host}`,
     pathParams: { dbName, workspace, region },
     queryParams: { gitBranch, fallbackBranch },
-    trace: defaultTrace
+    trace: defaultTrace,
+    clientName: options?.clientName
   });
   return branch;
 }
@@ -3355,7 +3359,12 @@ const buildClient = (plugins) => {
     const cache = options?.cache ?? new SimpleCache({ defaultQueryTTL: 0 });
     const trace = options?.trace ?? defaultTrace;
     const clientName = options?.clientName;
-    const branch = async () => options?.branch !== void 0 ? 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,
+      clientName: options?.clientName
+    });
     if (!apiKey) {
       throw new Error("Option apiKey is required");
     }
@@ -3477,7 +3486,7 @@ const deserialize = (json) => {
 };
 
 function buildWorkerRunner(config) {
-  return function xataWorker(name, _worker) {
+  return function xataWorker(name, worker) {
     return async (...args) => {
       const url = process.env.NODE_ENV === "development" ? `http://localhost:64749/${name}` : `https://dispatcher.xata.workers.dev/${config.workspace}/${config.worker}/${name}`;
       const result = await fetch(url, {