@xata.io/client 0.28.2 → 0.28.3

package/.turbo/turbo-add-version.log

@@ -1,4 +1,4 @@
 
-> @xata.io/client@0.28.2 add-version /home/runner/work/client-ts/client-ts/packages/client
+> @xata.io/client@0.28.3 add-version /home/runner/work/client-ts/client-ts/packages/client
 > node ../../scripts/add-version-file.mjs
 

package/.turbo/turbo-build.log

@@ -1,13 +1,13 @@
 
-> @xata.io/client@0.28.2 build /home/runner/work/client-ts/client-ts/packages/client
+> @xata.io/client@0.28.3 build /home/runner/work/client-ts/client-ts/packages/client
 > rimraf dist && rollup -c
 
 
 src/index.ts → dist/index.cjs...
-created dist/index.cjs in 756ms
+created dist/index.cjs in 742ms
 
 src/index.ts → dist/index.mjs...
-created dist/index.mjs in 471ms
+created dist/index.mjs in 472ms
 
 src/index.ts → dist/index.d.ts...
-created dist/index.d.ts in 5.5s
+created dist/index.d.ts in 5.2s

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @xata.io/client
 
+## 0.28.3
+
+### Patch Changes
+
+- [#1304](https://github.com/xataio/client-ts/pull/1304) [`b7f3ec9`](https://github.com/xataio/client-ts/commit/b7f3ec9eabe3642929131e244bd774f4d3134482) Thanks [@SferaDev](https://github.com/SferaDev)! - Rewrite upload url path
+
 ## 0.28.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -528,7 +528,7 @@ function defaultOnOpen(response) {
   }
 }
 
-const VERSION = "0.28.2";
+const VERSION = "0.28.3";
 
 class ErrorWithCause extends Error {
   constructor(message, options) {
@@ -571,6 +571,62 @@ function getMessage(data) {
   }
 }
 
+function getHostUrl(provider, type) {
+  if (isHostProviderAlias(provider)) {
+    return providers[provider][type];
+  } else if (isHostProviderBuilder(provider)) {
+    return provider[type];
+  }
+  throw new Error("Invalid API provider");
+}
+const providers = {
+  production: {
+    main: "https://api.xata.io",
+    workspaces: "https://{workspaceId}.{region}.xata.sh"
+  },
+  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) {
+  return isString(alias) && Object.keys(providers).includes(alias);
+}
+function isHostProviderBuilder(builder) {
+  return isObject(builder) && isString(builder.main) && isString(builder.workspaces);
+}
+function parseProviderString(provider = "production") {
+  if (isHostProviderAlias(provider)) {
+    return provider;
+  }
+  const [main, workspaces] = provider.split(",");
+  if (!main || !workspaces)
+    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;
+  const matches = {
+    production: url.match(/(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.xata\.sh.*/),
+    staging: url.match(/(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.staging-xata\.dev.*/),
+    dev: url.match(/(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.dev-xata\.dev.*/)
+  };
+  const [host, match] = Object.entries(matches).find(([, match2]) => match2 !== null) ?? [];
+  if (!isHostProviderAlias(host) || !match)
+    return null;
+  return { workspace: match[1], region: match[2], host };
+}
+
 const pool = new ApiRequestPool();
 const resolveUrl = (url, queryParams = {}, pathParams = {}) => {
   const cleanQueryParams = Object.entries(queryParams).reduce((acc, [key, value]) => {
@@ -586,6 +642,7 @@ const resolveUrl = (url, queryParams = {}, pathParams = {}) => {
   return url.replace(/\{\w*\}/g, (key) => cleanPathParams[key.slice(1, -1)]) + queryString;
 };
 function buildBaseUrl({
+  method,
   endpoint,
   path,
   workspacesApiUrl,
@@ -593,7 +650,24 @@ function buildBaseUrl({
   pathParams = {}
 }) {
   if (endpoint === "dataPlane") {
-    const url = isString(workspacesApiUrl) ? `${workspacesApiUrl}${path}` : workspacesApiUrl(path, pathParams);
+    let url = isString(workspacesApiUrl) ? `${workspacesApiUrl}${path}` : workspacesApiUrl(path, pathParams);
+    if (method.toUpperCase() === "PUT" && [
+      "/db/{dbBranchName}/tables/{tableName}/data/{recordId}/column/{columnName}/file",
+      "/db/{dbBranchName}/tables/{tableName}/data/{recordId}/column/{columnName}/file/{fileId}"
+    ].includes(path)) {
+      const { host } = parseWorkspacesUrlParts(url) ?? {};
+      switch (host) {
+        case "production":
+          url = url.replace("xata.sh", "upload.xata.sh");
+          break;
+        case "staging":
+          url = url.replace("staging-xata.dev", "upload.staging-xata.dev");
+          break;
+        case "dev":
+          url = url.replace("dev-xata.dev", "upload.dev-xata.dev");
+          break;
+      }
+    }
     const urlWithWorkspace = isString(pathParams.workspace) ? url.replace("{workspaceId}", String(pathParams.workspace)) : url;
     return isString(pathParams.region) ? urlWithWorkspace.replace("{region}", String(pathParams.region)) : urlWithWorkspace;
   }
@@ -642,7 +716,7 @@ async function fetch$1({
   return await trace(
     `${method.toUpperCase()} ${path}`,
     async ({ setAttributes }) => {
-      const baseUrl = buildBaseUrl({ endpoint, path, workspacesApiUrl, pathParams, apiUrl });
+      const baseUrl = buildBaseUrl({ method, endpoint, path, workspacesApiUrl, pathParams, apiUrl });
       const fullUrl = resolveUrl(baseUrl, queryParams, pathParams);
       const url = fullUrl.includes("localhost") ? fullUrl.replace(/^[^.]+\./, "http://") : fullUrl;
       setAttributes({
@@ -725,7 +799,7 @@ function fetchSSERequest({
   clientName,
   xataAgentExtra
 }) {
-  const baseUrl = buildBaseUrl({ endpoint, path, workspacesApiUrl, pathParams, apiUrl });
+  const baseUrl = buildBaseUrl({ method, endpoint, path, workspacesApiUrl, pathParams, apiUrl });
   const fullUrl = resolveUrl(baseUrl, queryParams, pathParams);
   const url = fullUrl.includes("localhost") ? fullUrl.replace(/^[^.]+\./, "http://") : fullUrl;
   void fetchEventSource(url, {
@@ -987,6 +1061,12 @@ const fileAccess = (variables, signal) => dataPlaneFetch({
   ...variables,
   signal
 });
+const fileUpload = (variables, signal) => dataPlaneFetch({
+  url: "/file/{fileId}",
+  method: "put",
+  ...variables,
+  signal
+});
 const sqlQuery = (variables, signal) => dataPlaneFetch({
   url: "/db/{dbBranchName}/sql",
   method: "post",
@@ -1056,7 +1136,7 @@ const operationsByTag$2 = {
     deleteRecord,
     bulkInsertTableRecords
   },
-  files: { getFileItem, putFileItem, deleteFileItem, getFile, putFile, deleteFile, fileAccess },
+  files: { getFileItem, putFileItem, deleteFileItem, getFile, putFile, deleteFile, fileAccess, fileUpload },
   searchAndFilter: {
     queryTable,
     searchBranch,
@@ -1263,61 +1343,6 @@ const operationsByTag$1 = {
 
 const operationsByTag = deepMerge(operationsByTag$2, operationsByTag$1);
 
-function getHostUrl(provider, type) {
-  if (isHostProviderAlias(provider)) {
-    return providers[provider][type];
-  } else if (isHostProviderBuilder(provider)) {
-    return provider[type];
-  }
-  throw new Error("Invalid API provider");
-}
-const providers = {
-  production: {
-    main: "https://api.xata.io",
-    workspaces: "https://{workspaceId}.{region}.xata.sh"
-  },
-  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) {
-  return isString(alias) && Object.keys(providers).includes(alias);
-}
-function isHostProviderBuilder(builder) {
-  return isObject(builder) && isString(builder.main) && isString(builder.workspaces);
-}
-function parseProviderString(provider = "production") {
-  if (isHostProviderAlias(provider)) {
-    return provider;
-  }
-  const [main, workspaces] = provider.split(",");
-  if (!main || !workspaces)
-    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;
-  const regex = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.xata\.sh.*/;
-  const regexDev = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.dev-xata\.dev.*/;
-  const regexStaging = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.staging-xata\.dev.*/;
-  const regexProdTesting = /(?:https:\/\/)?([^.]+)(?:\.([^.]+))\.xata\.tech.*/;
-  const match = url.match(regex) || url.match(regexDev) || url.match(regexStaging) || url.match(regexProdTesting);
-  if (!match)
-    return null;
-  return { workspace: match[1], region: match[2] };
-}
-
 var __accessCheck$7 = (obj, member, msg) => {
   if (!member.has(obj))
     throw TypeError("Cannot " + msg);
@@ -2678,10 +2703,12 @@ class XataFile {
     this.base64Content = file.base64Content;
     this.enablePublicUrl = file.enablePublicUrl;
     this.signedUrlTimeout = file.signedUrlTimeout;
+    this.uploadUrlTimeout = file.uploadUrlTimeout;
     this.size = file.size;
     this.version = file.version;
     this.url = file.url;
     this.signedUrl = file.signedUrl;
+    this.uploadUrl = file.uploadUrl;
     this.attributes = file.attributes;
   }
   static fromBuffer(buffer, options = {}) {
@@ -2772,7 +2799,7 @@ class XataFile {
 const parseInputFileEntry = async (entry) => {
   if (!isDefined(entry))
     return null;
-  const { id, name, mediaType, base64Content, enablePublicUrl, signedUrlTimeout } = await entry;
+  const { id, name, mediaType, base64Content, enablePublicUrl, signedUrlTimeout, uploadUrlTimeout } = await entry;
   return compactObject({
     id,
     // Name cannot be an empty string in our API
@@ -2780,7 +2807,8 @@ const parseInputFileEntry = async (entry) => {
     mediaType,
     base64Content,
     enablePublicUrl,
-    signedUrlTimeout
+    signedUrlTimeout,
+    uploadUrlTimeout
   });
 };
 
@@ -4848,6 +4876,7 @@ exports.equals = equals;
 exports.executeBranchMigrationPlan = executeBranchMigrationPlan;
 exports.exists = exists;
 exports.fileAccess = fileAccess;
+exports.fileUpload = fileUpload;
 exports.ge = ge;
 exports.getAPIKey = getAPIKey;
 exports.getAuthorizationCode = getAuthorizationCode;