@supabase/storage-js 2.103.0-canary.0 → 2.103.0-canary.2

package/dist/index.cjs

@@ -288,12 +288,22 @@ const _getRequestParams = (method, options, parameters, body) => {
 	};
 	if (method === "GET" || method === "HEAD" || !body) return _objectSpread2(_objectSpread2({}, params), parameters);
 	if (isPlainObject(body)) {
-		params.headers = _objectSpread2({ "Content-Type": "application/json" }, options === null || options === void 0 ? void 0 : options.headers);
+		var _contentType;
+		const headers = (options === null || options === void 0 ? void 0 : options.headers) || {};
+		let contentType;
+		for (const [key, value] of Object.entries(headers)) if (key.toLowerCase() === "content-type") contentType = value;
+		params.headers = setRequestHeader(headers, "Content-Type", (_contentType = contentType) !== null && _contentType !== void 0 ? _contentType : "application/json");
 		params.body = JSON.stringify(body);
 	} else params.body = body;
 	if (options === null || options === void 0 ? void 0 : options.duplex) params.duplex = options.duplex;
 	return _objectSpread2(_objectSpread2({}, params), parameters);
 };
+function setRequestHeader(headers, name, value) {
+	const nextHeaders = _objectSpread2({}, headers);
+	for (const key of Object.keys(nextHeaders)) if (key.toLowerCase() === name.toLowerCase()) delete nextHeaders[key];
+	nextHeaders[name] = value;
+	return nextHeaders;
+}
 /**
 * Internal request handler that wraps fetch with error handling
 * @param fetcher - Fetch function to use
@@ -367,7 +377,7 @@ var BaseApiClient = class {
 	constructor(url, headers = {}, fetch$1, namespace = "storage") {
 		this.shouldThrowOnError = false;
 		this.url = url;
-		this.headers = headers;
+		this.headers = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]));
 		this.fetch = resolveFetch(fetch$1);
 		this.namespace = namespace;
 	}
@@ -390,7 +400,7 @@ var BaseApiClient = class {
 	* @returns this - For method chaining
 	*/
 	setHeader(name, value) {
-		this.headers = _objectSpread2(_objectSpread2({}, this.headers), {}, { [name]: value });
+		this.headers = _objectSpread2(_objectSpread2({}, this.headers), {}, { [name.toLowerCase()]: value });
 		return this;
 	}
 	/**
@@ -892,6 +902,7 @@ var StorageFileApi = class extends BaseApiClient {
 	* @param expiresIn The number of seconds until the signed URL expires. For example, `60` for a URL which is valid for one minute.
 	* @param options.download triggers the file as a download if set to true. Set this parameter as the name of the file if you want to trigger the download with a different filename.
 	* @param options.transform Transform the asset before serving it to the client.
+	* @param options.cacheNonce Append a cache nonce parameter to the URL to invalidate the cache.
 	* @returns Promise with response containing signed URL or error
 	*
 	* @example Create Signed URL
@@ -947,9 +958,12 @@ var StorageFileApi = class extends BaseApiClient {
 			let _path = _this8._getFinalPath(path);
 			const hasTransform = typeof (options === null || options === void 0 ? void 0 : options.transform) === "object" && options.transform !== null && Object.keys(options.transform).length > 0;
 			let data = await post(_this8.fetch, `${_this8.url}/object/sign/${_path}`, _objectSpread2({ expiresIn }, hasTransform ? { transform: options.transform } : {}), { headers: _this8.headers });
-			const downloadQueryParam = (options === null || options === void 0 ? void 0 : options.download) ? `&download=${options.download === true ? "" : options.download}` : "";
+			const query = new URLSearchParams();
+			if (options === null || options === void 0 ? void 0 : options.download) query.set("download", options.download === true ? "" : options.download);
+			if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
+			const queryString = query.toString();
 			const returnedPath = hasTransform && data.signedURL.includes("/object/sign/") ? data.signedURL.replace("/object/sign/", "/render/image/sign/") : data.signedURL;
-			return { signedUrl: encodeURI(`${_this8.url}${returnedPath}${downloadQueryParam}`) };
+			return { signedUrl: encodeURI(`${_this8.url}${returnedPath}${queryString ? `&${queryString}` : ""}`) };
 		});
 	}
 	/**
@@ -959,6 +973,7 @@ var StorageFileApi = class extends BaseApiClient {
 	* @param paths The file paths to be downloaded, including the current file names. For example `['folder/image.png', 'folder2/image2.png']`.
 	* @param expiresIn The number of seconds until the signed URLs expire. For example, `60` for URLs which are valid for one minute.
 	* @param options.download triggers the file as a download if set to true. Set this parameter as the name of the file if you want to trigger the download with a different filename.
+	* @param options.cacheNonce Append a cache nonce parameter to the URL to invalidate the cache.
 	* @returns Promise with response containing array of objects with signedUrl, path, and error or error
 	*
 	* @example Create Signed URLs
@@ -1003,8 +1018,11 @@ var StorageFileApi = class extends BaseApiClient {
 				expiresIn,
 				paths
 			}, { headers: _this9.headers });
-			const downloadQueryParam = (options === null || options === void 0 ? void 0 : options.download) ? `&download=${options.download === true ? "" : options.download}` : "";
-			return data.map((datum) => _objectSpread2(_objectSpread2({}, datum), {}, { signedUrl: datum.signedURL ? encodeURI(`${_this9.url}${datum.signedURL}${downloadQueryParam}`) : null }));
+			const query = new URLSearchParams();
+			if (options === null || options === void 0 ? void 0 : options.download) query.set("download", options.download === true ? "" : options.download);
+			if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
+			const queryString = query.toString();
+			return data.map((datum) => _objectSpread2(_objectSpread2({}, datum), {}, { signedUrl: datum.signedURL ? encodeURI(`${_this9.url}${datum.signedURL}${queryString ? `&${queryString}` : ""}`) : null }));
 		});
 	}
 	/**
@@ -1013,6 +1031,7 @@ var StorageFileApi = class extends BaseApiClient {
 	* @category File Buckets
 	* @param path The full path and file name of the file to be downloaded. For example `folder/image.png`.
 	* @param options.transform Transform the asset before serving it to the client.
+	* @param options.cacheNonce Append a cache nonce parameter to the URL to invalidate the cache.
 	* @param parameters Additional fetch parameters like signal for cancellation. Supports standard fetch options including cache control.
 	* @returns BlobDownloadBuilder instance for downloading the file
 	*
@@ -1073,10 +1092,12 @@ var StorageFileApi = class extends BaseApiClient {
 	*/
 	download(path, options, parameters) {
 		const renderPath = typeof (options === null || options === void 0 ? void 0 : options.transform) !== "undefined" ? "render/image/authenticated" : "object";
-		const transformationQuery = this.transformOptsToQueryString((options === null || options === void 0 ? void 0 : options.transform) || {});
-		const queryString = transformationQuery ? `?${transformationQuery}` : "";
+		const query = new URLSearchParams();
+		if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
+		if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
+		const queryString = query.toString();
 		const _path = this._getFinalPath(path);
-		const downloadFn = () => get(this.fetch, `${this.url}/${renderPath}/${_path}${queryString}`, {
+		const downloadFn = () => get(this.fetch, `${this.url}/${renderPath}/${_path}${queryString ? `?${queryString}` : ""}`, {
 			headers: this.headers,
 			noResolveJson: true
 		}, parameters);
@@ -1157,6 +1178,7 @@ var StorageFileApi = class extends BaseApiClient {
 	* @param path The path and name of the file to generate the public URL for. For example `folder/image.png`.
 	* @param options.download Triggers the file as a download if set to true. Set this parameter as the name of the file if you want to trigger the download with a different filename.
 	* @param options.transform Transform the asset before serving it to the client.
+	* @param options.cacheNonce Append a cache nonce parameter to the URL to invalidate the cache.
 	* @returns Object with public URL
 	*
 	* @example Returns the URL for an asset in a public bucket
@@ -1208,15 +1230,13 @@ var StorageFileApi = class extends BaseApiClient {
 	*/
 	getPublicUrl(path, options) {
 		const _path = this._getFinalPath(path);
-		const _queryString = [];
-		const downloadQueryParam = (options === null || options === void 0 ? void 0 : options.download) ? `download=${options.download === true ? "" : options.download}` : "";
-		if (downloadQueryParam !== "") _queryString.push(downloadQueryParam);
+		const query = new URLSearchParams();
+		if (options === null || options === void 0 ? void 0 : options.download) query.set("download", options.download === true ? "" : options.download);
+		if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
+		if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
+		const queryString = query.toString();
 		const renderPath = typeof (options === null || options === void 0 ? void 0 : options.transform) !== "undefined" ? "render/image" : "object";
-		const transformationQuery = this.transformOptsToQueryString((options === null || options === void 0 ? void 0 : options.transform) || {});
-		if (transformationQuery !== "") _queryString.push(transformationQuery);
-		let queryString = _queryString.join("&");
-		if (queryString !== "") queryString = `?${queryString}`;
-		return { data: { publicUrl: encodeURI(`${this.url}/${renderPath}/public/${_path}${queryString}`) } };
+		return { data: { publicUrl: encodeURI(`${this.url}/${renderPath}/public/${_path}`) + (queryString ? `?${queryString}` : "") } };
 	}
 	/**
 	* Deletes files within the same bucket
@@ -1419,20 +1439,20 @@ var StorageFileApi = class extends BaseApiClient {
 	_removeEmptyFolders(path) {
 		return path.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
 	}
-	transformOptsToQueryString(transform) {
-		const params = [];
-		if (transform.width) params.push(`width=${transform.width}`);
-		if (transform.height) params.push(`height=${transform.height}`);
-		if (transform.resize) params.push(`resize=${transform.resize}`);
-		if (transform.format) params.push(`format=${transform.format}`);
-		if (transform.quality) params.push(`quality=${transform.quality}`);
-		return params.join("&");
+	/** Modifies the `query`, appending values the from `transform` */
+	applyTransformOptsToQuery(query, transform) {
+		if (transform.width) query.set("width", transform.width.toString());
+		if (transform.height) query.set("height", transform.height.toString());
+		if (transform.resize) query.set("resize", transform.resize);
+		if (transform.format) query.set("format", transform.format);
+		if (transform.quality) query.set("quality", transform.quality.toString());
+		return query;
 	}
 };
 
 //#endregion
 //#region src/lib/version.ts
-const version = "2.103.0-canary.0";
+const version = "2.103.0-canary.2";
 
 //#endregion
 //#region src/lib/constants.ts