Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update jsii-srcmak #3081

Merged
merged 4 commits into from
Aug 16, 2023
Merged

chore: update jsii-srcmak #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4014586
chore: force jsii-srcmak to use current jsii-pacmak version
DanielMSchmidt Aug 16, 2023
1d5aa84
chore: adjust assertions
DanielMSchmidt Aug 16, 2023
fa551bf
chore: update jsii-srcmak
DanielMSchmidt Aug 16, 2023
c1043ce
chore: update jsii-srcmak
DanielMSchmidt Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@cdktf/cli-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"ink-use-stdout-dimensions": "^1.0.5",
"jsii": "^5.1.10",
"jsii-pacmak": "^1.87.0",
"jsii-srcmak": "^0.1.950",
"jsii-srcmak": "^0.1.951",
"lodash.isequal": "^4.5.0",
"log4js": "^6.7.0",
"minimatch": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@cdktf/provider-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"codemaker": "^1.87.0",
"deepmerge": "^4.2.2",
"fs-extra": "^8.1.0",
"jsii-srcmak": "^0.1.950"
"jsii-srcmak": "^0.1.951"
},
"devDependencies": {
"@types/deepmerge": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdktf-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"ink-testing-library": "^2.1.0",
"ink-use-stdout-dimensions": "^1.0.5",
"jest": "^29.5.0",
"jsii-srcmak": "^0.1.950",
"jsii-srcmak": "^0.1.951",
"lodash.isequal": "^4.5.0",
"log4js": "^6.7.0",
"nock": "^13.2.9",
Expand Down
24 changes: 8 additions & 16 deletions test/csharp/edge/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,20 @@ describe("csharp full integration test synth", () => {
const item = stack.byId("from_list");

expect(item.bool).toEqual(
'${lookup(element(list_block_resource.list.req, 0), "reqbool", false)}'
"${element(list_block_resource.list.req, 0).reqbool}"
);
expect(item.str).toEqual("${list_block_resource.list.req[0].reqstr}");
expect(item.num).toEqual(
'${lookup(element(list_block_resource.list.req, 0), "reqnum", 0)}'
"${element(list_block_resource.list.req, 0).reqnum}"
);
expect(item.boolList).toEqual([
'${lookup(element(list_block_resource.list.req, 0), "reqbool", false)}',
"${element(list_block_resource.list.req, 0).reqbool}",
]);
expect(item.strList).toEqual([
"${list_block_resource.list.req[0].reqstr}",
]);
expect(item.numList).toEqual([
'${lookup(element(list_block_resource.list.req, 0), "reqnum", 0)}',
"${element(list_block_resource.list.req, 0).reqnum}",
]);
});

Expand Down Expand Up @@ -177,24 +177,16 @@ describe("csharp full integration test synth", () => {
const item = stack.byId("from_map");

// Expands map references
expect(item.bool).toEqual(
'${lookup(map_resource.map.reqMap, "key1", false)}'
);
expect(item.bool).toEqual("${map_resource.map.reqMap.key1}");
expect(item.str).toEqual(
'${lookup(map_resource.map.optMap, "key1", "missing")}'
);
expect(item.num).toEqual(
'${lookup(map_resource.map.computedMap, "key1", 0)}'
);
expect(item.boolList).toEqual([
'${lookup(map_resource.map.reqMap, "key1", false)}',
]);
expect(item.num).toEqual("${map_resource.map.computedMap.key1}");
expect(item.boolList).toEqual(["${map_resource.map.reqMap.key1}"]);
expect(item.strList).toEqual([
'${lookup(map_resource.map.optMap, "key1", "missing")}',
]);
expect(item.numList).toEqual([
'${lookup(map_resource.map.computedMap, "key1", 0)}',
]);
expect(item.numList).toEqual(["${map_resource.map.computedMap.key1}"]);
});

it("item references a full map", () => {
Expand Down
91 changes: 13 additions & 78 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,20 +1173,20 @@
chalk "^4.1.2"
semver "^7.5.4"

"@jsii/[email protected]", "@jsii/spec@^1.85.0", "@jsii/spec@^1.86.0":
version "1.86.0"
resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.86.0.tgz#f8ff41b319fd00f4bcfeead2137375dc947bd882"
integrity sha512-4aSVSKbE50LEJbky6bVvl4wmbZJqIJCQt+qFkUQzxbmbpM/K9iDTCD+EXMqHU1lRs33Wcu86MvDxtVCncXiNuQ==
dependencies:
ajv "^8.12.0"

"@jsii/[email protected]", "@jsii/spec@^1.87.0":
version "1.87.0"
resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.87.0.tgz#99b9dd12ed92120e79e645538620db0526a7ad7b"
integrity sha512-fhTT3IYmjyRKvUUWffBIuGDVVfyKC+QfE1cMyExSHl7l6wk6unrxS8qsU23kaJ5bNQAnlc2+CE1HteY2SLbepg==
dependencies:
ajv "^8.12.0"

"@jsii/spec@^1.85.0", "@jsii/spec@^1.86.0":
version "1.86.0"
resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.86.0.tgz#f8ff41b319fd00f4bcfeead2137375dc947bd882"
integrity sha512-4aSVSKbE50LEJbky6bVvl4wmbZJqIJCQt+qFkUQzxbmbpM/K9iDTCD+EXMqHU1lRs33Wcu86MvDxtVCncXiNuQ==
dependencies:
ajv "^8.12.0"

"@lerna/[email protected]":
version "6.6.1"
resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.6.1.tgz#e31bc411ad6d474cf7b676904da6f77f58fd64eb"
Expand Down Expand Up @@ -3375,15 +3375,6 @@ code-excerpt@^3.0.0:
dependencies:
convert-to-spaces "^1.0.1"

codemaker@^1.86.0:
version "1.86.0"
resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.86.0.tgz#c4a72a8888d2c13fd81f7ff6693225a0d0090af2"
integrity sha512-ljRR4xToexcgZj0QgQ09x3JJItgMphqbbKG+UPK+MGcd65oZf891d9yjCj0MUbNRQ26iHj1jTR4tU9TW+q9LfQ==
dependencies:
camelcase "^6.3.0"
decamelize "^5.0.1"
fs-extra "^10.1.0"

codemaker@^1.86.1:
version "1.86.1"
resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.86.1.tgz#2e34bdab7201ac712532bccba61b8d571348417d"
Expand Down Expand Up @@ -7284,25 +7275,6 @@ jsii-docgen@^9.1.2:
semver "^7.5.4"
yargs "^16.2.0"

jsii-pacmak@^1.86.0:
version "1.86.0"
resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.86.0.tgz#6c61fc7202cedc1d6da23fd7e7ea3b2eea1b39f8"
integrity sha512-AUFqGpMgXsYlUWHtquIINRNGPx0X+EFCBqflwG195yla0Sblj/GYpjg8w/7/tvnr6EELZjlq9nRg+1+TCCVg8w==
dependencies:
"@jsii/check-node" "1.86.0"
"@jsii/spec" "^1.86.0"
clone "^2.1.2"
codemaker "^1.86.0"
commonmark "^0.30.0"
escape-string-regexp "^4.0.0"
fs-extra "^10.1.0"
jsii-reflect "^1.86.0"
jsii-rosetta "^1.86.0"
semver "^7.5.4"
spdx-license-list "^6.6.0"
xmlbuilder "^15.1.1"
yargs "^16.2.0"

jsii-pacmak@^1.87.0:
version "1.87.0"
resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.87.0.tgz#dfc0cbc2b926af32761275493d5fb6b49a8f906b"
Expand All @@ -7322,7 +7294,7 @@ jsii-pacmak@^1.87.0:
xmlbuilder "^15.1.1"
yargs "^16.2.0"

jsii-reflect@^1.85.0, jsii-reflect@^1.86.0:
jsii-reflect@^1.85.0:
version "1.86.0"
resolved "https://registry.yarnpkg.com/jsii-reflect/-/jsii-reflect-1.86.0.tgz#b1e19605ef1b777f92fb91e9cb9ae579419d1d69"
integrity sha512-LlaVKhMHPYN6pEutH83nesWS5VQuEOToy+GtXU8quYilVMQ6rAlo3LgzdBdQd+jSjROKDa/BgAkt4hWdGa5VLQ==
Expand All @@ -7346,24 +7318,6 @@ jsii-reflect@^1.87.0:
oo-ascii-tree "^1.87.0"
yargs "^16.2.0"

jsii-rosetta@^1.86.0:
version "1.86.0"
resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.86.0.tgz#ea752a765083585643fb32187b4e9517919b3825"
integrity sha512-pKQR2fQHDi59vKEhYAI15fZDIK/MGr7nBxFqjwlSolh8yNJArYLhNwJKvAgY8TfXEoIXK37hJT/9G9VgNSOcTQ==
dependencies:
"@jsii/check-node" "1.86.0"
"@jsii/spec" "1.86.0"
"@xmldom/xmldom" "^0.8.10"
commonmark "^0.30.0"
fast-glob "^3.3.1"
jsii "1.86.0"
semver "^7.5.4"
semver-intersect "^1.4.0"
stream-json "^1.8.0"
typescript "~3.9.10"
workerpool "^6.4.0"
yargs "^16.2.0"

jsii-rosetta@^1.87.0:
version "1.87.0"
resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.87.0.tgz#56662445fed810c8b54324cb7387dfdf614aca49"
Expand Down Expand Up @@ -7401,36 +7355,17 @@ jsii-rosetta@^5.1.9:
workerpool "^6.4.0"
yargs "^17.7.2"

jsii-srcmak@^0.1.950:
version "0.1.950"
resolved "https://registry.yarnpkg.com/jsii-srcmak/-/jsii-srcmak-0.1.950.tgz#6787c70403848d35591217d926e0f4a3ac84169b"
integrity sha512-tv40puwfmgeYfYiO8vZLWAgDe42tkrZeUSCfBat0mJW7cGWpJ3UAjSMas1d2XOBG4Y/e+0ysxVwyyt6EwM0OAA==
jsii-srcmak@^0.1.951:
version "0.1.951"
resolved "https://registry.yarnpkg.com/jsii-srcmak/-/jsii-srcmak-0.1.951.tgz#dd589f12f227d80674e5c9fd111aa672ac40a769"
integrity sha512-zaKqrsR416yX+QhE1T4mkBWqPpsHQmBnBbsR0f5a32Uknr3+l4PCVtuV5/rgthAG6iE4Pa6c/jO0vcTzyzEY6A==
dependencies:
fs-extra "^9.1.0"
jsii "~5.1.10"
jsii-pacmak "^1.86.0"
jsii-pacmak "^1.87.0"
ncp "^2.0.0"
yargs "^15.4.1"

[email protected]:
version "1.86.0"
resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.86.0.tgz#c1c4e116fd57f66de836520ba1a7072cbcd2478b"
integrity sha512-FIIbGLOfCvbAV/TNsEoHC/JJuQy5VSpCejlmvahG8s9D53rTOd9XKpOHwlNmV3ZQ47g2p381mnnioOl7dx7uug==
dependencies:
"@jsii/check-node" "1.86.0"
"@jsii/spec" "^1.86.0"
case "^1.6.3"
chalk "^4"
fast-deep-equal "^3.1.3"
fs-extra "^10.1.0"
log4js "^6.9.1"
semver "^7.5.4"
semver-intersect "^1.4.0"
sort-json "^2.0.1"
spdx-license-list "^6.6.0"
typescript "~3.9.10"
yargs "^16.2.0"

[email protected]:
version "1.87.0"
resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.87.0.tgz#a57c6b286a82ca032bf4d3ff48d92c0161a8666c"
Expand Down
Loading