Skip to content

Commit ad64cbd

Browse files
committed
use existing api
1 parent 8e8d406 commit ad64cbd

File tree

3 files changed

+13
-151
lines changed

3 files changed

+13
-151
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import software.amazon.smithy.codegen.core.SymbolDependency;
2222
import software.amazon.smithy.model.node.Node;
2323
import software.amazon.smithy.model.node.ObjectNode;
24-
import software.amazon.smithy.typescript.codegen.util.MergeJsonNodes;
2524
import software.amazon.smithy.utils.IoUtils;
2625
import software.amazon.smithy.utils.SmithyInternalApi;
2726

@@ -44,11 +43,19 @@ static void writePackageJson(
4443
) {
4544
// Write the package.json file.
4645
InputStream resource = PackageJsonGenerator.class.getResourceAsStream("base-package.json");
47-
ObjectNode node = MergeJsonNodes.mergeWithScripts(
48-
Node.parse(IoUtils.toUtf8String(resource))
49-
.expectObjectNode(),
50-
settings.getPackageJson()
51-
);
46+
47+
ObjectNode userSuppliedPackageJson = settings.getPackageJson();
48+
ObjectNode defaultPackageJson = Node.parse(IoUtils.toUtf8String(resource))
49+
.expectObjectNode();
50+
51+
ObjectNode mergedScripts = defaultPackageJson.expectObjectNode("scripts")
52+
.merge(
53+
userSuppliedPackageJson.getObjectMember("scripts")
54+
.orElse(ObjectNode.builder().build())
55+
);
56+
57+
ObjectNode node = defaultPackageJson.merge(userSuppliedPackageJson)
58+
.withMember("scripts", mergedScripts);
5259

5360
// Merge TypeScript dependencies into the package.json file.
5461
for (Map.Entry<String, Map<String, SymbolDependency>> depEntry : dependencies.entrySet()) {

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/util/MergeJsonNodes.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/util/MergeJsonNodesTest.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)