@aws-sdk/lib-storage 3.1067.0 → 3.1069.0

package/dist-cjs/index.js

@@ -1,19 +1,17 @@
-'use strict';
-
-var clientS3 = require('@aws-sdk/client-s3');
-var endpoints = require('@smithy/core/endpoints');
-var protocols = require('@smithy/core/protocols');
-var events = require('events');
-var buffer = require('buffer');
-var runtimeConfig = require('./runtimeConfig');
-var stream = require('stream');
+const { PutObjectCommand, ChecksumAlgorithm, CreateMultipartUploadCommand, AbortMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, PutObjectTaggingCommand } = require("@aws-sdk/client-s3");
+const { toEndpointV1, getEndpointFromInstructions } = require("@smithy/core/endpoints");
+const { extendedEncodeURIComponent } = require("@smithy/core/protocols");
+const { EventEmitter } = require("events");
+const { Buffer } = require("buffer");
+const { runtimeConfig } = require("./runtimeConfig");
+const { Readable } = require("stream");
 
 const byteLength = (input) => {
     if (input == null) {
         return 0;
     }
     if (typeof input === "string") {
-        return buffer.Buffer.byteLength(input);
+        return Buffer.byteLength(input);
     }
     if (typeof input.byteLength === "number") {
         return input.byteLength;
@@ -27,9 +25,9 @@ const byteLength = (input) => {
     else if (typeof input.start === "number" && typeof input.end === "number") {
         return input.end + 1 - input.start;
     }
-    else if (runtimeConfig.runtimeConfig.isFileReadStream(input)) {
+    else if (runtimeConfig.isFileReadStream(input)) {
         try {
-            return runtimeConfig.runtimeConfig.lstatSync(input.path).size;
+            return runtimeConfig.lstatSync(input.path).size;
         }
         catch (error) {
             return undefined;
@@ -71,9 +69,9 @@ const byteLengthSource = (input, override) => {
     else if (typeof input.start === "number" && typeof input.end === "number") {
         return BYTE_LENGTH_SOURCE.START_END_DIFF;
     }
-    else if (runtimeConfig.runtimeConfig.isFileReadStream(input)) {
+    else if (runtimeConfig.isFileReadStream(input)) {
         try {
-            runtimeConfig.runtimeConfig.lstatSync(input.path).size;
+            runtimeConfig.lstatSync(input.path).size;
             return BYTE_LENGTH_SOURCE.LSTAT;
         }
         catch (error) {
@@ -90,7 +88,7 @@ async function* getChunkStream(data, partSize, getNextData) {
         currentBuffer.chunks.push(datum);
         currentBuffer.length += datum.byteLength;
         while (currentBuffer.length > partSize) {
-            const dataChunk = currentBuffer.chunks.length > 1 ? buffer.Buffer.concat(currentBuffer.chunks) : currentBuffer.chunks[0];
+            const dataChunk = currentBuffer.chunks.length > 1 ? Buffer.concat(currentBuffer.chunks) : currentBuffer.chunks[0];
             yield {
                 partNumber,
                 data: dataChunk.subarray(0, partSize),
@@ -102,7 +100,7 @@ async function* getChunkStream(data, partSize, getNextData) {
     }
     yield {
         partNumber,
-        data: currentBuffer.chunks.length !== 1 ? buffer.Buffer.concat(currentBuffer.chunks) : currentBuffer.chunks[0],
+        data: currentBuffer.chunks.length !== 1 ? Buffer.concat(currentBuffer.chunks) : currentBuffer.chunks[0],
         lastPart: true,
     };
 }
@@ -129,11 +127,11 @@ async function* getChunkUint8Array(data, partSize) {
 
 async function* getDataReadable(data) {
     for await (const chunk of data) {
-        if (buffer.Buffer.isBuffer(chunk) || chunk instanceof Uint8Array) {
+        if (Buffer.isBuffer(chunk) || chunk instanceof Uint8Array) {
             yield chunk;
         }
         else {
-            yield buffer.Buffer.from(chunk);
+            yield Buffer.from(chunk);
         }
     }
 }
@@ -146,11 +144,11 @@ async function* getDataReadableStream(data) {
             if (done) {
                 return;
             }
-            if (buffer.Buffer.isBuffer(value) || value instanceof Uint8Array) {
+            if (Buffer.isBuffer(value) || value instanceof Uint8Array) {
                 yield value;
             }
             else {
-                yield buffer.Buffer.from(value);
+                yield Buffer.from(value);
             }
         }
     }
@@ -166,11 +164,11 @@ const getChunk = (data, partSize) => {
     if (data instanceof Uint8Array) {
         return getChunkUint8Array(data, partSize);
     }
-    if (data instanceof stream.Readable) {
+    if (data instanceof Readable) {
         return getChunkStream(data, partSize, getDataReadable);
     }
     if (data instanceof String || typeof data === "string") {
-        return getChunkUint8Array(buffer.Buffer.from(data), partSize);
+        return getChunkUint8Array(Buffer.from(data), partSize);
     }
     if (typeof data.stream === "function") {
         return getChunkStream(data.stream(), partSize, getDataReadableStream);
@@ -181,7 +179,7 @@ const getChunk = (data, partSize) => {
     throw new Error("Body Data is unsupported format, expected data to be one of: string | Uint8Array | Buffer | Readable | ReadableStream | Blob;.");
 };
 
-class Upload extends events.EventEmitter {
+class Upload extends EventEmitter {
     static MIN_PART_SIZE = 1024 * 1024 * 5;
     MAX_PARTS = 10_000;
     queueSize = 4;
@@ -245,7 +243,7 @@ class Upload extends events.EventEmitter {
         const params = { ...this.params, Body: dataPart.data };
         const clientConfig = this.client.config;
         const requestHandler = clientConfig.requestHandler;
-        const eventEmitter = requestHandler instanceof events.EventEmitter ? requestHandler : null;
+        const eventEmitter = requestHandler instanceof EventEmitter ? requestHandler : null;
         const uploadEventListener = (event) => {
             this.bytesUploadedSoFar = event.loaded;
             this.totalBytes = event.total;
@@ -260,11 +258,11 @@ class Upload extends events.EventEmitter {
         if (eventEmitter !== null) {
             eventEmitter.on("xhr.upload.progress", uploadEventListener);
         }
-        const resolved = await Promise.all([this.client.send(new clientS3.PutObjectCommand(params)), clientConfig?.endpoint?.()]);
+        const resolved = await Promise.all([this.client.send(new PutObjectCommand(params)), clientConfig?.endpoint?.()]);
         const putResult = resolved[0];
         let endpoint = resolved[1];
         if (!endpoint) {
-            endpoint = endpoints.toEndpointV1(await endpoints.getEndpointFromInstructions(params, clientS3.PutObjectCommand, {
+            endpoint = toEndpointV1(await getEndpointFromInstructions(params, PutObjectCommand, {
                 ...clientConfig,
             }));
         }
@@ -276,9 +274,9 @@ class Upload extends events.EventEmitter {
         }
         const locationKey = this.params
             .Key.split("/")
-            .map((segment) => protocols.extendedEncodeURIComponent(segment))
+            .map((segment) => extendedEncodeURIComponent(segment))
             .join("/");
-        const locationBucket = protocols.extendedEncodeURIComponent(this.params.Bucket);
+        const locationBucket = extendedEncodeURIComponent(this.params.Bucket);
         const Location = (() => {
             const endpointHostnameIncludesBucket = endpoint.hostname.startsWith(`${locationBucket}.`);
             const forcePathStyle = this.client.config.forcePathStyle;
@@ -311,12 +309,12 @@ class Upload extends events.EventEmitter {
         if (!this.createMultiPartPromise) {
             const createCommandParams = { ...this.params, Body: undefined };
             if (requestChecksumCalculation === "WHEN_SUPPORTED") {
-                createCommandParams.ChecksumAlgorithm = this.params.ChecksumAlgorithm || clientS3.ChecksumAlgorithm.CRC32;
+                createCommandParams.ChecksumAlgorithm = this.params.ChecksumAlgorithm || ChecksumAlgorithm.CRC32;
             }
             this.createMultiPartPromise = this.client
-                .send(new clientS3.CreateMultipartUploadCommand(createCommandParams))
+                .send(new CreateMultipartUploadCommand(createCommandParams))
                 .then((createMpuResponse) => {
-                this.abortMultipartUploadCommand = new clientS3.AbortMultipartUploadCommand({
+                this.abortMultipartUploadCommand = new AbortMultipartUploadCommand({
                     Bucket: this.params.Bucket,
                     Key: this.params.Key,
                     UploadId: createMpuResponse.UploadId,
@@ -346,7 +344,7 @@ class Upload extends events.EventEmitter {
             }
             const partSize = byteLength(dataPart.data) || 0;
             const requestHandler = this.client.config.requestHandler;
-            const eventEmitter = requestHandler instanceof events.EventEmitter ? requestHandler : null;
+            const eventEmitter = requestHandler instanceof EventEmitter ? requestHandler : null;
             let lastSeenBytes = 0;
             const uploadEventListener = (event, request) => {
                 const requestPartSize = Number(request.query["partNumber"]) || -1;
@@ -370,7 +368,7 @@ class Upload extends events.EventEmitter {
             }
             this.uploadEnqueuedPartsCount += 1;
             this.__validateUploadPart(dataPart);
-            const partResult = await this.client.send(new clientS3.UploadPartCommand({
+            const partResult = await this.client.send(new UploadPartCommand({
                 ...this.params,
                 ContentLength: undefined,
                 UploadId: this.uploadId,
@@ -444,7 +442,7 @@ to input.params.ContentLength in bytes.
                     Parts: this.uploadedParts,
                 },
             };
-            result = await this.client.send(new clientS3.CompleteMultipartUploadCommand(uploadCompleteParams));
+            result = await this.client.send(new CompleteMultipartUploadCommand(uploadCompleteParams));
             if (typeof result?.Location === "string" && result.Location.includes("%2F")) {
                 result.Location = result.Location.replace(/%2F/g, "/");
             }
@@ -454,7 +452,7 @@ to input.params.ContentLength in bytes.
         }
         this.abortMultipartUploadCommand = null;
         if (this.tags.length) {
-            await this.client.send(new clientS3.PutObjectTaggingCommand({
+            await this.client.send(new PutObjectTaggingCommand({
                 ...this.params,
                 Tagging: {
                     TagSet: this.tags,

package/dist-cjs/runtimeConfig.browser.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runtimeConfig = void 0;
-const runtimeConfig_shared_1 = require("./runtimeConfig.shared");
-exports.runtimeConfig = {
-    ...runtimeConfig_shared_1.runtimeConfigShared,
+const { runtimeConfigShared: shared } = require("./runtimeConfig.shared");
+const runtimeConfig = {
+    ...shared,
     runtime: "browser",
 };
+exports.runtimeConfig = runtimeConfig;

package/dist-cjs/runtimeConfig.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runtimeConfig = void 0;
-const node_fs_1 = require("node:fs");
-const runtimeConfig_shared_1 = require("./runtimeConfig.shared");
-exports.runtimeConfig = {
-    ...runtimeConfig_shared_1.runtimeConfigShared,
+const { lstatSync, ReadStream } = require("node:fs");
+const { runtimeConfigShared: shared } = require("./runtimeConfig.shared");
+const runtimeConfig = {
+    ...shared,
     runtime: "node",
-    lstatSync: node_fs_1.lstatSync,
+    lstatSync,
     isFileReadStream(f) {
-        return f instanceof node_fs_1.ReadStream;
+        return f instanceof ReadStream;
     },
 };
+exports.runtimeConfig = runtimeConfig;

package/dist-cjs/runtimeConfig.native.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runtimeConfig = void 0;
-const runtimeConfig_browser_1 = require("./runtimeConfig.browser");
-exports.runtimeConfig = {
-    ...runtimeConfig_browser_1.runtimeConfig,
+const { runtimeConfig: browserConfig } = require("./runtimeConfig.browser");
+const runtimeConfig = {
+    ...browserConfig,
     runtime: "react-native",
 };
+exports.runtimeConfig = runtimeConfig;

package/dist-cjs/runtimeConfig.shared.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runtimeConfigShared = void 0;
 exports.runtimeConfigShared = {
     lstatSync: () => { },
     isFileReadStream(f) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/lib-storage",
-  "version": "3.1067.0",
+  "version": "3.1069.0",
   "description": "Storage higher order operation",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -8,11 +8,11 @@
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "extract:docs": "api-extractor run --local",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch",
@@ -38,10 +38,10 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.1067.0"
+    "@aws-sdk/client-s3": "^3.1069.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.1067.0",
+    "@aws-sdk/client-s3": "3.1069.0",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^20.14.8",
     "concurrently": "7.0.0",