lean-s3 0.7.2 → 0.7.3

package/dist/index.d.ts

@@ -57,7 +57,7 @@ type DeleteObjectsError = {
     message: string;
     versionId: string;
 };
-interface S3FilePresignOptions {
+interface S3FilePresignOptions extends OverridableS3ClientOptions {
     contentHash?: Buffer;
     /** Seconds. */
     expiresIn?: number;
@@ -346,8 +346,7 @@ declare class S3Client {
      * });
      * ```
      */
-    presign(path: string, { method, expiresIn, // TODO: Maybe rename this to expiresInSeconds
-    storageClass, contentLength, type, acl, region: regionOverride, bucket: bucketOverride, endpoint: endpointOverride, response, }?: S3FilePresignOptions & OverridableS3ClientOptions): string;
+    presign(path: string, optio2ns?: S3FilePresignOptions): string;
     createMultipartUpload(key: string, options?: CreateMultipartUploadOptions): Promise<CreateMultipartUploadResult>;
     /**
      * @remarks Uses [`ListMultipartUploads`](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListMultipartUploads.html).

package/dist/index.js

@@ -511,52 +511,44 @@ var S3Client = class {
    * });
    * ```
    */
-  presign(path, {
-    method = "GET",
-    expiresIn = 3600,
-    // TODO: Maybe rename this to expiresInSeconds
-    storageClass,
-    contentLength,
-    type,
-    acl,
-    region: regionOverride,
-    bucket: bucketOverride,
-    endpoint: endpointOverride,
-    response
-  } = {}) {
+  presign(path, optio2ns = {}) {
+    const contentLength = optio2ns.contentLength ?? void 0;
     if (typeof contentLength === "number") {
       if (contentLength < 0) {
         throw new RangeError("`contentLength` must be >= 0.");
       }
     }
+    const method = optio2ns.method ?? "GET";
+    const contentType = optio2ns.type ?? void 0;
+    const region = optio2ns.region ?? this.#options.region;
+    const bucket = optio2ns.bucket ?? this.#options.bucket;
+    const endpoint = optio2ns.endpoint ?? this.#options.endpoint;
+    const responseOptions = optio2ns.response;
+    const contentDisposition = responseOptions?.contentDisposition;
+    const responseContentDisposition = contentDisposition ? getContentDispositionHeader(contentDisposition) : void 0;
+    const res = buildRequestUrl(endpoint, bucket, region, path);
     const now2 = /* @__PURE__ */ new Date();
     const date = getAmzDate(now2);
-    const options = this.#options;
-    const region = regionOverride ?? options.region;
-    const bucket = bucketOverride ?? options.bucket;
-    const endpoint = endpointOverride ?? options.endpoint;
-    const responseContentDisposition = response?.contentDisposition ? getContentDispositionHeader(response?.contentDisposition) : void 0;
-    const res = buildRequestUrl(endpoint, bucket, region, path);
     const query = buildSearchParams(
-      `${options.accessKeyId}/${date.date}/${region}/s3/aws4_request`,
+      `${this.#options.accessKeyId}/${date.date}/${region}/s3/aws4_request`,
       date,
-      expiresIn,
-      typeof contentLength === "number" || typeof type === "string" ? typeof contentLength === "number" && typeof type === "string" ? "content-length;content-type;host" : typeof contentLength === "number" ? "content-length;host" : typeof type === "string" ? "content-type;host" : "" : "host",
+      optio2ns.expiresIn ?? 3600,
+      typeof contentLength === "number" || typeof contentType === "string" ? typeof contentLength === "number" && typeof contentType === "string" ? "content-length;content-type;host" : typeof contentLength === "number" ? "content-length;host" : typeof contentType === "string" ? "content-type;host" : "" : "host",
       unsignedPayload,
-      storageClass,
-      options.sessionToken,
-      acl,
+      optio2ns.storageClass,
+      this.#options.sessionToken,
+      optio2ns.acl,
       responseContentDisposition
     );
-    const dataDigest = typeof contentLength === "number" || typeof type === "string" ? createCanonicalDataDigest(
+    const dataDigest = typeof contentLength === "number" || typeof contentType === "string" ? createCanonicalDataDigest(
       method,
       res.pathname,
       query,
-      typeof contentLength === "number" && typeof type === "string" ? {
+      typeof contentLength === "number" && typeof contentType === "string" ? {
         "content-length": String(contentLength),
-        "content-type": type,
+        "content-type": contentType,
         host: res.host
-      } : typeof contentLength === "number" ? { "content-length": String(contentLength), host: res.host } : typeof type === "string" ? { "content-type": type, host: res.host } : {},
+      } : typeof contentLength === "number" ? { "content-length": String(contentLength), host: res.host } : typeof contentType === "string" ? { "content-type": contentType, host: res.host } : {},
       unsignedPayload
     ) : createCanonicalDataDigestHostOnly(
       method,
@@ -567,8 +559,8 @@ var S3Client = class {
     const signingKey = this.#keyCache.computeIfAbsent(
       date,
       region,
-      options.accessKeyId,
-      options.secretAccessKey
+      this.#options.accessKeyId,
+      this.#options.secretAccessKey
     );
     const signature = signCanonicalDataHash(
       signingKey,

package/package.json

@@ -2,7 +2,7 @@
   "name": "lean-s3",
   "author": "Niklas Mollenhauer",
   "license": "MIT",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "A server-side S3 API for the regular user.",
   "keywords": [
     "s3",