Skip to content

Commit e1fe413

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

File tree

5 files changed

+18
-152
lines changed

5 files changed

+18
-152
lines changed

private/smithy-rpcv2-cbor/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"build:types": "tsc -p tsconfig.types.json",
1010
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
1111
"clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
12-
"prepack": "yarn run clean && yarn run build"
12+
"prepack": "yarn run clean && yarn run build",
13+
"merged": "echo \"this is merged from user configuration.\""
1314
},
1415
"main": "./dist-cjs/index.js",
1516
"types": "./dist-types/index.d.ts",

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.expectObjectMember("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.

smithy-typescript-protocol-test-codegen/smithy-build.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"name": "Smithy team",
2020
"url": "https://smithy.io/"
2121
},
22+
"scripts": {
23+
"merged": "echo \"this is merged from user configuration.\""
24+
},
2225
"license": "Apache-2.0"
2326
},
2427
"private": true,

0 commit comments

Comments
 (0)