Skip to content

Commit 588e173

Browse files
authored
merge url-parser-node and url-parser-browser; add url-parser-native (#265)
1 parent e92c8f6 commit 588e173

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGenerator.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ final class RuntimeConfigGenerator {
5353
TypeScriptDependency.AWS_SDK_HASH_NODE.packageName);
5454
writer.write("sha256: Hash.bind(null, \"sha256\"),");
5555
},
56-
"urlParser", writer -> {
57-
writer.addDependency(TypeScriptDependency.AWS_SDK_URL_PARSER_NODE);
58-
writer.addImport("parseUrl", "parseUrl",
59-
TypeScriptDependency.AWS_SDK_URL_PARSER_NODE.packageName);
60-
writer.write("urlParser: parseUrl,");
61-
},
6256
"bodyLengthChecker", writer -> {
6357
writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_BODY_LENGTH_NODE);
6458
writer.addImport("calculateBodyLength", "calculateBodyLength",
@@ -109,12 +103,6 @@ final class RuntimeConfigGenerator {
109103
TypeScriptDependency.AWS_CRYPTO_SHA256_BROWSER.packageName);
110104
writer.write("sha256: Sha256,");
111105
},
112-
"urlParser", writer -> {
113-
writer.addDependency(TypeScriptDependency.AWS_SDK_URL_PARSER_BROWSER);
114-
writer.addImport("parseUrl", "parseUrl",
115-
TypeScriptDependency.AWS_SDK_URL_PARSER_BROWSER.packageName);
116-
writer.write("urlParser: parseUrl,");
117-
},
118106
"bodyLengthChecker", writer -> {
119107
writer.addDependency(TypeScriptDependency.AWS_SDK_UTIL_BODY_LENGTH_BROWSER);
120108
writer.addImport("calculateBodyLength", "calculateBodyLength",
@@ -160,15 +148,21 @@ final class RuntimeConfigGenerator {
160148
writer.write("sha256: Sha256,");
161149
},
162150
"urlParser", writer -> {
163-
writer.addDependency(TypeScriptDependency.AWS_SDK_URL_PARSER_NODE);
151+
writer.addDependency(TypeScriptDependency.AWS_SDK_URL_PARSER_NATIVE);
164152
writer.addImport("parseUrl", "parseUrl",
165-
TypeScriptDependency.AWS_SDK_URL_PARSER_NODE.packageName);
153+
TypeScriptDependency.AWS_SDK_URL_PARSER_NATIVE.packageName);
166154
writer.write("urlParser: parseUrl,");
167155
}
168156
);
169157
private final Map<String, Consumer<TypeScriptWriter>> sharedRuntimeConfigDefaults = MapUtils.of(
170158
"disableHostPrefix", writer -> {
171159
writer.write("disableHostPrefix: false,");
160+
},
161+
"urlParser", writer -> {
162+
writer.addDependency(TypeScriptDependency.AWS_SDK_URL_PARSER);
163+
writer.addImport("parseUrl", "parseUrl",
164+
TypeScriptDependency.AWS_SDK_URL_PARSER.packageName);
165+
writer.write("urlParser: parseUrl,");
172166
}
173167
);
174168

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public enum TypeScriptDependency implements SymbolDependencyContainer {
4444
AWS_CRYPTO_SHA256_JS("dependencies", "@aws-crypto/sha256-js", "^1.0.0", true),
4545
AWS_SDK_HASH_NODE("dependencies", "@aws-sdk/hash-node", "3.0.0", true),
4646

47-
AWS_SDK_URL_PARSER_BROWSER("dependencies", "@aws-sdk/url-parser-browser", "3.0.0", true),
48-
AWS_SDK_URL_PARSER_NODE("dependencies", "@aws-sdk/url-parser-node", "3.0.0", true),
47+
AWS_SDK_URL_PARSER("dependencies", "@aws-sdk/url-parser", "3.0.0", true),
48+
AWS_SDK_URL_PARSER_NATIVE("dependencies", "@aws-sdk/url-parser-native", "3.0.0", true),
4949

5050
AWS_SDK_UTIL_BASE64_BROWSER("dependencies", "@aws-sdk/util-base64-browser", "3.0.0", true),
5151
AWS_SDK_UTIL_BASE64_NODE("dependencies", "@aws-sdk/util-base64-node", "3.0.0", true),

0 commit comments

Comments
 (0)