@xata.io/client 0.0.0-alpha.vedf1c64 → 0.0.0-alpha.vf170c2c

package/CHANGELOG.md

@@ -1,12 +1,5 @@
 # @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,91 +64,6 @@ 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;
-    }
-  }
-  try {
-    return XATA_BRANCH;
-  } catch (err) {
-  }
-}
-function getDatabaseURL() {
-  try {
-    return getEnvVariable("XATA_DATABASE_URL") ?? XATA_DATABASE_URL;
-  } catch (err) {
-    return void 0;
-  }
-}
-function getAPIKey() {
-  try {
-    return getEnvVariable("XATA_API_KEY") ?? XATA_API_KEY;
-  } catch (err) {
-    return void 0;
-  }
-}
-
 class FetcherError extends Error {
   constructor(status, data) {
     super(getMessage(data));
@@ -1542,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);