@xata.io/client 0.0.0-alpha.vf05617f → 0.0.0-alpha.vf38f30b

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @xata.io/client
 
+## 0.8.4
+
+### Patch Changes
+
+- dd958a4: Fix search results return type
+- f5ec686: Make XataApiClientOptions optional
+
 ## 0.8.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -47,6 +47,14 @@ 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 ?? globalFetch;
@@ -56,88 +64,34 @@ function getFetchImplementation(userFetch) {
   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?.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;
+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() {
-  try {
-    return getEnvVariable("XATA_DATABASE_URL") ?? XATA_DATABASE_URL;
-  } catch (err) {
-    return void 0;
-  }
+function isBulkError(error) {
+  return isObject(error) && Array.isArray(error.errors);
 }
-function getAPIKey() {
-  try {
-    return getEnvVariable("XATA_API_KEY") ?? 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";
   }
 }
 
@@ -195,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",
@@ -232,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",
@@ -254,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",
@@ -330,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",
@@ -413,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",
@@ -527,7 +456,7 @@ 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, {});
     const provider = options.host ?? "production";
@@ -1456,9 +1385,10 @@ var __privateAdd$2 = (obj, member, value) => {
 };
 var _tables;
 class SchemaPlugin extends XataPlugin {
-  constructor(links) {
+  constructor(links, tableNames) {
     super();
     this.links = links;
+    this.tableNames = tableNames;
     __privateAdd$2(this, _tables, {});
   }
   build(options) {
@@ -1473,6 +1403,9 @@ class SchemaPlugin extends XataPlugin {
         return __privateGet$1(this, _tables)[table];
       }
     });
+    for (const table of this.tableNames ?? []) {
+      db[table] = new RestRepository({ db, getFetchProps, table, links });
+    }
     return db;
   }
 }
@@ -1536,6 +1469,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);
@@ -1561,13 +1572,13 @@ 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) {
+    constructor(options = {}, links, tables) {
       __privateAdd(this, _parseOptions);
       __privateAdd(this, _getFetchProps);
       __privateAdd(this, _evaluateBranch);
       __privateAdd(this, _branch, void 0);
       const safeOptions = __privateMethod(this, _parseOptions, parseOptions_fn).call(this, options);
-      const db = new SchemaPlugin(links).build({ getFetchProps: () => __privateMethod(this, _getFetchProps, getFetchProps_fn).call(this, safeOptions) });
+      const db = new SchemaPlugin(links, tables).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)
       });