feat: Use @smithy/util-utf8

package.json

@@ -41,7 +41,7 @@
     "@aws-sdk/types": "^3.222.0",
     "@aws-sdk/util-buffer-from": "^3.29.0",
     "@aws-sdk/util-hex-encoding": "^3.29.0",
-    "@aws-sdk/util-utf8-browser": "^3.29.0",
+    "@smithy/util-utf8": "^2.0.0",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.7.18",

packages/crc32/test/index.test.ts

@@ -1,7 +1,7 @@
 import "mocha";
 import { expect } from "chai";
 import { Crc32, AwsCrc32 } from "../src/index";
-import { fromUtf8 } from "@aws-sdk/util-utf8-browser";
+import { fromUtf8 } from "@smithy/util-utf8";
 
 type TestVector = [Uint8Array, number];
 

packages/crc32c/test/index.test.ts

@@ -1,7 +1,7 @@
 import "mocha";
 import { expect } from "chai";
 import { Crc32c, AwsCrc32c } from "../src";
-import { fromUtf8 } from "@aws-sdk/util-utf8-browser";
+import { fromUtf8 } from "@smithy/util-utf8";
 
 type TestVector = [Uint8Array, number];
 

packages/sha1-browser/package.json

@@ -22,7 +22,7 @@
     "@aws-crypto/util": "file:../util",
     "@aws-sdk/types": "^3.222.0",
     "@aws-sdk/util-locate-window": "^3.0.0",
-    "@aws-sdk/util-utf8-browser": "^3.0.0",
+    "@smithy/util-utf8": "^2.0.0",
     "tslib": "^1.11.1"
   },
   "main": "./build/index.js",

packages/sha1-browser/src/webCryptoSha1.ts

@@ -1,5 +1,5 @@
 import { Checksum, SourceData } from "@aws-sdk/types";
-import { fromUtf8 } from "@aws-sdk/util-utf8-browser";
+import { fromUtf8 } from "@smithy/util-utf8";
 import { isEmptyData } from "./isEmptyData";
 import { EMPTY_DATA_SHA_1, SHA_1_HASH, SHA_1_HMAC_ALGO } from "./constants";
 import { locateWindow } from "@aws-sdk/util-locate-window";

packages/sha1-browser/test/webCryptoSha1.test.ts

@@ -8,8 +8,6 @@ import {
 } from "../src/constants";
 import { flushPromises } from "./testUtils.fixture";
 import * as sinon from "sinon";
-
-import * as utf8Browser from "@aws-sdk/util-utf8-browser";
 import { locateWindow } from "@aws-sdk/util-locate-window";
 
 describe("Sha1", () => {
@@ -22,7 +20,6 @@ describe("Sha1", () => {
       },
     };
 
-    sinon.stub(utf8Browser, "fromUtf8");
   });
 
   afterEach(() => sinon.restore());
@@ -77,27 +74,24 @@ describe("Sha1", () => {
 
   it("should convert empty string secrets to empty ArrayBuffers", async () => {
     const { importKey } = locateWindow().crypto.subtle;
-    (utf8Browser.fromUtf8 as sinon.SinonStub).returns(new ArrayBuffer(0));
 
     const sha1 = new Sha1("");
     await flushPromises();
 
-    sinon.assert.calledOnce(utf8Browser.fromUtf8 as sinon.SinonStub);
-    const [str] = (utf8Browser.fromUtf8 as sinon.SinonStub).firstCall.args;
-    expect(str).to.eql("");
-
     const [_, key] = (importKey as sinon.SinonStub).firstCall.args;
 
-    expect(key).to.deep.equal(new ArrayBuffer(0));
+    expect(key).to.deep.equal(new Uint8Array(0));
   });
 
   it("should import string secrets via the browser UTF-8 decoder", async () => {
+    const { importKey } = locateWindow().crypto.subtle;
+
     const sha1 = new Sha1("secret");
     await flushPromises();
 
-    sinon.assert.calledOnce(utf8Browser.fromUtf8 as sinon.SinonStub);
-    const [str] = (utf8Browser.fromUtf8 as sinon.SinonStub).firstCall.args;
-    expect(str).to.eql("secret");
+    const [_, key] = (importKey as sinon.SinonStub).firstCall.args;
+
+    expect(key).to.deep.equal(new Uint8Array([ 115, 101, 99, 114, 101, 116 ]));
   });
 
   it("should trap UTF-8 errors", async () => {

packages/sha256-browser/package.json

@@ -23,7 +23,7 @@
     "@aws-crypto/util": "file:../util",
     "@aws-sdk/types": "^3.222.0",
     "@aws-sdk/util-locate-window": "^3.0.0",
-    "@aws-sdk/util-utf8-browser": "^3.0.0",
+    "@smithy/util-utf8": "^2.0.0",
     "tslib": "^1.11.1"
   },
   "main": "./build/index.js",

packages/sha256-browser/test/webCryptoSha256.test.ts

@@ -9,7 +9,6 @@ import {
 import { flushPromises } from "./testUtils.fixture";
 import * as sinon from "sinon";
 
-import * as utf8Browser from "@aws-sdk/util-utf8-browser";
 import { locateWindow } from "@aws-sdk/util-locate-window";
 
 describe("Sha256", () => {
@@ -22,7 +21,6 @@ describe("Sha256", () => {
       },
     };
 
-    sinon.stub(utf8Browser, "fromUtf8");
   });
 
   afterEach(() => sinon.restore());

packages/util/package.json

@@ -21,7 +21,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/types": "^3.222.0",
-    "@aws-sdk/util-utf8-browser": "^3.0.0",
+    "@smithy/util-utf8": "^2.0.0",
     "tslib": "^1.11.1"
   },
   "publishConfig": {

packages/util/src/convertToBuffer.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SourceData } from "@aws-sdk/types";
-import { fromUtf8 as fromUtf8Browser } from "@aws-sdk/util-utf8-browser";
+import { fromUtf8 as fromUtf8Browser } from "@smithy/util-utf8";
 
 // Quick polyfill
 const fromUtf8 =