Skip to content

Commit

Permalink
use existing api
Browse files Browse the repository at this point in the history
  • Loading branch information
kuhe committed Aug 28, 2024
1 parent 8682531 commit 5b3287a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 151 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import software.amazon.smithy.codegen.core.SymbolDependency;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.model.node.ObjectNode;
import software.amazon.smithy.typescript.codegen.util.MergeJsonNodes;
import software.amazon.smithy.utils.IoUtils;
import software.amazon.smithy.utils.SmithyInternalApi;

Expand All @@ -44,11 +43,19 @@ static void writePackageJson(
) {
// Write the package.json file.
InputStream resource = PackageJsonGenerator.class.getResourceAsStream("base-package.json");
ObjectNode node = MergeJsonNodes.mergeWithScripts(
Node.parse(IoUtils.toUtf8String(resource))
.expectObjectNode(),
settings.getPackageJson()
);

ObjectNode userSuppliedPackageJson = settings.getPackageJson();
ObjectNode defaultPackageJson = Node.parse(IoUtils.toUtf8String(resource))
.expectObjectNode();

ObjectNode mergedScripts = defaultPackageJson.expectObjectNode("scripts")
.merge(
userSuppliedPackageJson.getObjectMember("scripts")
.orElse(ObjectNode.builder().build())
);

ObjectNode node = defaultPackageJson.merge(userSuppliedPackageJson)
.withMember("scripts", mergedScripts);

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

This file was deleted.

This file was deleted.

0 comments on commit 5b3287a

Please sign in to comment.