From 607b84b1acd53b5fbc1557a814eb5d10bad5114a Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Thu, 23 Apr 2020 14:20:07 +0200 Subject: [PATCH] chore(monocdk): upgrade jsii and generate bindings for monocdk (#7520) Those bindings are experimental in that the name of types within those is subject to change in the future as jsii adds features to enable name customization. The names are eventually expected to converge to those in the individual modules --- package.json | 6 +- packages/cdk-dasm/package.json | 2 +- packages/decdk/package.json | 4 +- packages/monocdk-experiment/.gitignore | 1 + packages/monocdk-experiment/.npmignore | 1 + packages/monocdk-experiment/build.sh | 18 +- packages/monocdk-experiment/gen.js | 36 ++-- packages/monocdk-experiment/package.json | 25 ++- packages/monocdk-experiment/tsconfig.json | 18 -- scripts/check-api-compatibility.sh | 1 + tools/awslint/package.json | 4 +- tools/cdk-build-tools/package.json | 4 +- tools/cfn2ts/package.json | 2 +- yarn.lock | 234 ++++++++++++++-------- 14 files changed, 219 insertions(+), 137 deletions(-) delete mode 100644 packages/monocdk-experiment/tsconfig.json diff --git a/package.json b/package.json index dbee4f54492ad..3a486f40e72f4 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "devDependencies": { "conventional-changelog-cli": "^2.0.31", "fs-extra": "^8.1.0", - "jsii-diff": "^1.3.2", - "jsii-pacmak": "^1.3.2", - "jsii-rosetta": "^1.3.2", + "jsii-diff": "^1.4.1", + "jsii-pacmak": "^1.4.1", + "jsii-rosetta": "^1.4.1", "lerna": "^3.20.2", "standard-version": "^7.1.0", "typescript": "~3.8.3" diff --git a/packages/cdk-dasm/package.json b/packages/cdk-dasm/package.json index e3b6fc3069b8c..aa6edd21d75bf 100644 --- a/packages/cdk-dasm/package.json +++ b/packages/cdk-dasm/package.json @@ -26,7 +26,7 @@ }, "license": "Apache-2.0", "dependencies": { - "codemaker": "^1.3.2", + "codemaker": "^1.4.1", "yaml": "1.9.2" }, "devDependencies": { diff --git a/packages/decdk/package.json b/packages/decdk/package.json index 4e049cdbd372c..a4c7de508fdfe 100644 --- a/packages/decdk/package.json +++ b/packages/decdk/package.json @@ -173,7 +173,7 @@ "@aws-cdk/region-info": "0.0.0", "constructs": "^3.0.2", "fs-extra": "^8.1.0", - "jsii-reflect": "^1.3.2", + "jsii-reflect": "^1.4.1", "jsonschema": "^1.2.6", "yaml": "1.9.2", "yargs": "^15.3.1" @@ -184,7 +184,7 @@ "@types/yaml": "1.2.0", "@types/yargs": "^15.0.4", "jest": "^25.4.0", - "jsii": "^1.3.2" + "jsii": "^1.4.1" }, "keywords": [ "aws", diff --git a/packages/monocdk-experiment/.gitignore b/packages/monocdk-experiment/.gitignore index 4a03ddbdf2f9f..a25055f733262 100644 --- a/packages/monocdk-experiment/.gitignore +++ b/packages/monocdk-experiment/.gitignore @@ -3,3 +3,4 @@ !deps.js !gen.js staging/ +tsconfig.json diff --git a/packages/monocdk-experiment/.npmignore b/packages/monocdk-experiment/.npmignore index 40bc5fe6ba3f5..0b96cfab1fbc5 100644 --- a/packages/monocdk-experiment/.npmignore +++ b/packages/monocdk-experiment/.npmignore @@ -16,4 +16,5 @@ dist .LAST_PACKAGE .jsii +tsconfig.json *.tsbuildinfo diff --git a/packages/monocdk-experiment/build.sh b/packages/monocdk-experiment/build.sh index 0d1742e577ff8..eeb21879b484d 100755 --- a/packages/monocdk-experiment/build.sh +++ b/packages/monocdk-experiment/build.sh @@ -15,11 +15,11 @@ echo "installing dependencies for bundling..." npm install echo "compiling..." -tsc +${CDK_BUILD_JSII:-jsii} echo "packaging..." -npm pack -tarball=$PWD/monocdk-experiment-*.tgz +${CDK_PACKAGE_JSII_PACMAK:-jsii-pacmak} +tarball=$PWD/dist/js/monocdk-experiment@*.tgz echo "verifying package..." cd $(mktemp -d) @@ -28,11 +28,11 @@ npm install ${tarball} constructs@${constructs_version} node -e "require('monocdk-experiment')" unpacked=$(node -p 'path.dirname(require.resolve("monocdk-experiment/package.json"))') -# saving tarball -cd ${scriptdir} -mkdir -p dist/js -cp ${tarball} dist/js +# saving publishable artifact +rm -fr ${scriptdir}/dist +mv ${outdir}/dist ${scriptdir}/dist # so this module will also work as a local dependency (e.g. for modules under @monocdk-experiment/*). -rm -fr staging -mv ${unpacked} staging +rm -fr ${scriptdir}/staging +mv ${unpacked} ${scriptdir}/staging +mv ${scriptdir}/staging/.jsii ${scriptdir} diff --git a/packages/monocdk-experiment/gen.js b/packages/monocdk-experiment/gen.js index 4a68e0fc81a0e..ff187cf84241d 100644 --- a/packages/monocdk-experiment/gen.js +++ b/packages/monocdk-experiment/gen.js @@ -5,11 +5,11 @@ const path = require('path'); const glob = require('glob'); const os = require('os'); -const exclude_modules = [ +const exclude_modules = [ // 'aws-lambda-nodejs' // bundles "parcel" which is unacceptable for now ]; -const include_non_jsii = [ +const include_non_jsii = [ // 'assert', // 'cloudformation-diff', ]; @@ -22,14 +22,14 @@ const include_dev_deps = [ const exclude_files = [ 'test', 'scripts', - 'node_modules', - 'package.json', - 'tsconfig.json', - 'tsconfig.tsbuildinfo', - '.gitignore', - '.jsii', - 'LICENSE', - 'NOTICE' + 'node_modules', + 'package.json', + 'tsconfig.json', + 'tsconfig.tsbuildinfo', + '.gitignore', + '.jsii', + 'LICENSE', + 'NOTICE' ]; async function main() { @@ -46,6 +46,10 @@ async function main() { const modules = await fs.readdir(root); const manifest = await fs.readJson(path.join(monocdkroot, 'package.json')); + // Adjust index location for initial compilation + manifest.main = manifest.main.replace(/^staging\//, ''); + manifest.types = manifest.types.replace(/^staging\//, ''); + const nodeTypes = manifest.devDependencies['@types/node']; if (!nodeTypes) { throw new Error(`@types/node must be defined in devDependencies`); @@ -134,12 +138,12 @@ async function main() { const bundled = [ ...meta.bundleDependencies || [], ...meta.bundledDependencies || [] ]; for (const d of bundled) { const ver = meta.dependencies[d]; - + console.error(`adding bundled dep ${d} with version ${ver}`); if (!pkgBundled.includes(d)) { pkgBundled.push(d); } - + if (!ver) { throw new Error(`cannot determine version for bundled dep ${d} of module ${meta.name}`); } @@ -151,7 +155,7 @@ async function main() { throw new Error(`version mismatch for bundled dep ${d}: ${meta.name} requires version ${ver} but we already have version ${existingVer}`); } } - } + } } await fs.writeFile(path.join(outdir, 'index.ts'), reexports.join('\n')); @@ -162,12 +166,12 @@ async function main() { await rewriteImports(outdir, source); } - // copy tsconfig.json and .npmignore - const files = [ 'tsconfig.json', '.npmignore', 'README.md', 'LICENSE', 'NOTICE' ]; + // copy .npmignore, license stuff, readme, ... + const files = [ '.npmignore', 'README.md', 'LICENSE', 'NOTICE' ]; for (const file of files) { await fs.copy(path.join(monocdkroot, file), path.join(outdir, file)); } - + console.error('writing package.json'); await fs.writeJson(path.join(outdir, 'package.json'), manifest, { spaces: 2 }); diff --git a/packages/monocdk-experiment/package.json b/packages/monocdk-experiment/package.json index fc4058eedbbca..17bd0a871959a 100644 --- a/packages/monocdk-experiment/package.json +++ b/packages/monocdk-experiment/package.json @@ -2,8 +2,8 @@ "name": "monocdk-experiment", "version": "0.0.0", "description": "An experiment to bundle the entire CDK into a single module", - "main": "index.js", - "types": "index.d.ts", + "main": "staging/index.js", + "types": "staging/index.d.ts", "repository": { "type": "git", "url": "https://github.com/aws/aws-cdk.git" @@ -17,6 +17,27 @@ "build+test": "npm run build && npm test", "build+test+package": "npm run build+test && npm run package" }, + "jsii": { + "outdir": "dist", + "targets": { + "java": { + "package": "software.amazon.awscdk.monocdkexperiment", + "maven": { + "groupId": "software.amazon.awscdk", + "artifactId": "monocdk-experiment", + "versionSuffix": ".DEVPREVIEW" + } + }, + "dotnet": { + "namespace": "Amazon.CDK.MonoCDK.Experiment", + "packageId": "Amazon.CDK.MonoCDK.Experiment", + "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/master/logo/default-256-dark.png", + "versionSuffix": "-devpreview", + "signAssembly": true, + "assemblyOriginatorKeyFile": "../../key.snk" + } + } + }, "author": { "name": "Amazon Web Services", "url": "https://aws.amazon.com", diff --git a/packages/monocdk-experiment/tsconfig.json b/packages/monocdk-experiment/tsconfig.json deleted file mode 100644 index 8039efc7a72bd..0000000000000 --- a/packages/monocdk-experiment/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": ["es2018"], - "strict": true, - "alwaysStrict": true, - "declaration": true, - "inlineSourceMap": true, - "inlineSources": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "resolveJsonModule": true, - "incremental": true - }, -} diff --git a/scripts/check-api-compatibility.sh b/scripts/check-api-compatibility.sh index f73702b61c639..a2fdb1ac57c27 100755 --- a/scripts/check-api-compatibility.sh +++ b/scripts/check-api-compatibility.sh @@ -71,6 +71,7 @@ success=true for dir in $jsii_package_dirs; do name=$(package_name "$dir") if [[ ! -d $tmpdir/node_modules/$name ]]; then continue; fi + if [[ ! -f $tmpdir/node_modules/$name/.jsii ]]; then continue; fi echo -n "$name... " if npx jsii-diff \ --keys \ diff --git a/tools/awslint/package.json b/tools/awslint/package.json index 83c675d8f596f..5a7d9cbcf2f4f 100644 --- a/tools/awslint/package.json +++ b/tools/awslint/package.json @@ -16,11 +16,11 @@ "awslint": "bin/awslint" }, "dependencies": { - "@jsii/spec": "^1.3.2", + "@jsii/spec": "^1.4.1", "camelcase": "^6.0.0", "colors": "^1.4.0", "fs-extra": "^8.1.0", - "jsii-reflect": "^1.3.2", + "jsii-reflect": "^1.4.1", "yargs": "^15.3.1" }, "devDependencies": { diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json index 2f54ebf8482d3..34b706b00b327 100644 --- a/tools/cdk-build-tools/package.json +++ b/tools/cdk-build-tools/package.json @@ -49,8 +49,8 @@ "eslint-plugin-import": "^2.20.2", "fs-extra": "^8.1.0", "jest": "^25.4.0", - "jsii": "^1.3.2", - "jsii-pacmak": "^1.3.2", + "jsii": "^1.4.1", + "jsii-pacmak": "^1.4.1", "nodeunit": "^0.11.3", "nyc": "^15.0.1", "ts-jest": "^25.4.0", diff --git a/tools/cfn2ts/package.json b/tools/cfn2ts/package.json index 4be86cf87b570..f435be1374daa 100644 --- a/tools/cfn2ts/package.json +++ b/tools/cfn2ts/package.json @@ -30,7 +30,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-cdk/cfnspec": "0.0.0", - "codemaker": "^1.3.2", + "codemaker": "^1.4.1", "fast-json-patch": "^3.0.0-1", "fs-extra": "^8.1.0", "yargs": "^15.3.1" diff --git a/yarn.lock b/yarn.lock index 35150ab4f8bab..d636c4b8052a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,38 +2,6 @@ # yarn lockfile v1 -"@aws-cdk/aws-imagebuilder@1.34.1": - version "1.34.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/aws-imagebuilder/-/aws-imagebuilder-1.34.1.tgz#ae40cc78dfdfef421d7a3337cf909f112e43352b" - integrity sha512-WQjgZscfVPV5maatdFgvhPNp2Pdcs7KXat2uMfXF4LgaUmIa+BQ90LFShkfxDESvGZQTrMXgdOqPOwUuVmNR+Q== - dependencies: - "@aws-cdk/core" "1.34.1" - -"@aws-cdk/cloud-assembly-schema@1.34.1": - version "1.34.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-1.34.1.tgz#c79eb4ccbe0301c2c0ad4d640d005b27de419a98" - integrity sha512-zBiP2ty4LgeFl0ulc8kDbAzI5MeKdkIwWd7ef1qz+pk4YfBtAjsHbJDzk/apkR7Yaf7Tum9UuPf7yCK4mB18IA== - dependencies: - jsonschema "^1.2.5" - semver "^7.2.2" - -"@aws-cdk/core@1.34.1": - version "1.34.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/core/-/core-1.34.1.tgz#30ed9a457e2f5206180a61939d064cbbf24425b0" - integrity sha512-Lay8Wly6DBTTEJxeW/UNvC0MJbxZcbzSCwxcchHS4KzKaf40CnEIi9jEoSZ2VokjfJCI0KvlXaAB4z1Mt0kGOg== - dependencies: - "@aws-cdk/cloud-assembly-schema" "1.34.1" - "@aws-cdk/cx-api" "1.34.1" - constructs "^3.0.2" - -"@aws-cdk/cx-api@1.34.1": - version "1.34.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-1.34.1.tgz#f1e5ca6f5c6315047e01f07aa8da34acad368a83" - integrity sha512-6eS08/6/iZPbsKeUlnmmflPYHirk3DSocSSRWCsmx9vcb2xQgHKJaWJWPcPXeaPyK3BuTe0Zw/XsC2SVD+u30Q== - dependencies: - "@aws-cdk/cloud-assembly-schema" "1.34.1" - semver "^7.2.2" - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" @@ -1257,10 +1225,10 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jsii/spec@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.3.2.tgz#e669d63e08864b3df5fcd8083dc6a9088c96008d" - integrity sha512-iQjb8FnOgw/Pfjq5cKXnIHfTZDv1hDbgPMsymv58KfRgyq+NZOHr7AHNNn1oha0VStCJVinA3gVsNVnK8suxZQ== +"@jsii/spec@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.4.1.tgz#35893433c7144bc56efcf3528bc9e21c638ea405" + integrity sha512-iARdSgmuq2+9BCS9fd2RD+KN7FCPwXCW8pIJkAaTWDJolS9cmVaNp7WWZKLhdo7UkPDUpYzLUW3nCc5dimo3iw== dependencies: jsonschema "^1.2.6" @@ -2668,6 +2636,11 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" +app-root-path@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a" + integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA== + append-transform@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" @@ -2918,7 +2891,7 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: dependencies: array-filter "^1.0.0" -aws-sdk-mock@^5.1.0: +aws-sdk-mock@^5.0.0, aws-sdk-mock@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/aws-sdk-mock/-/aws-sdk-mock-5.1.0.tgz#6f2c0bd670d7f378c906a8dd806f812124db71aa" integrity sha512-Wa5eCSo8HX0Snqb7FdBylaXMmfrAWoWZ+d7MFhiYsgHPvNvMEGjV945FF2qqE1U0Tolr1ALzik1fcwgaOhqUWQ== @@ -2927,6 +2900,21 @@ aws-sdk-mock@^5.1.0: sinon "^9.0.1" traverse "^0.6.6" +aws-sdk@^2.596.0: + version "2.660.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.660.0.tgz#1be2f814ffdb1aadf859b252601974073a39a4b2" + integrity sha512-6FR91Jg1x9TuFglsdBHkRuE4X7sPRwqeTB2GwLk9XPX1giicdMvJrWbcw5rUnMKjXs9LVlkwaK5VI9AJ0d8dpw== + dependencies: + buffer "4.9.1" + events "1.1.1" + ieee754 "1.1.13" + jmespath "0.15.0" + querystring "0.2.0" + sax "1.2.1" + url "0.10.3" + uuid "3.3.2" + xml2js "0.4.19" + aws-sdk@^2.637.0, aws-sdk@^2.661.0: version "2.661.0" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.661.0.tgz#e877dbc0d07b74e93e2383eb4cd0407592b1e46e" @@ -3739,10 +3727,10 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codemaker@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.3.2.tgz#e9f41e6d78329e927bb5def77b3d26caa57bc15e" - integrity sha512-KVMT/b65M8+WeWrhIxoGbpREtavrZBT3Zc4/MXO6vl2H2RXn0HWGuzYNXCmi+QkDGutUYsXQfHqH2H3hrw4FKQ== +codemaker@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.4.1.tgz#fc87559a99fa751add5ea53380c41cf12afad128" + integrity sha512-UCyJxq94GNli8wxPQc4lItDOdoK6XCjevgcS7GKix8lTLgR4IFhbd9Y/ZcV6n04r2PEKT44yErSLvCsJ31nQ3g== dependencies: camelcase "^6.0.0" decamelize "^1.2.0" @@ -4904,11 +4892,21 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== +dotenv-json@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dotenv-json/-/dotenv-json-1.0.0.tgz#fc7f672aafea04bed33818733b9f94662332815c" + integrity sha512-jAssr+6r4nKhKRudQ0HOzMskOFFi9+ubXWwmrSGJFgTvpjyPXCXsCsYbjif6mXp7uxA7xY3/LGaiTQukZzSbOQ== + dotenv@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" integrity sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow== +dotenv@^8.0.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + dotgitignore@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b" @@ -5143,6 +5141,11 @@ escodegen@~1.9.0: optionalDependencies: source-map "~0.6.1" +eslint-config-standard@^14.1.0: + version "14.1.1" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea" + integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg== + eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" @@ -5170,7 +5173,15 @@ eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" -eslint-plugin-import@^2.20.2: +eslint-plugin-es@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976" + integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ== + dependencies: + eslint-utils "^1.4.2" + regexpp "^3.0.0" + +eslint-plugin-import@^2.19.1, eslint-plugin-import@^2.20.2: version "2.20.2" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== @@ -5188,6 +5199,28 @@ eslint-plugin-import@^2.20.2: read-pkg-up "^2.0.0" resolve "^1.12.0" +eslint-plugin-node@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6" + integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ== + dependencies: + eslint-plugin-es "^2.0.0" + eslint-utils "^1.4.2" + ignore "^5.1.1" + minimatch "^3.0.4" + resolve "^1.10.1" + semver "^6.1.0" + +eslint-plugin-promise@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== + +eslint-plugin-standard@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" + integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== + eslint-scope@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" @@ -5196,7 +5229,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: +eslint-utils@^1.4.2, eslint-utils@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -6410,6 +6443,11 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.1.1: + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" @@ -7796,7 +7834,7 @@ jest@^24.9.0: import-local "^2.0.0" jest-cli "^24.9.0" -jest@^25.4.0: +jest@^25.3.0, jest@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/jest/-/jest-25.4.0.tgz#fb96892c5c4e4a6b9bcb12068849cddf4c5f8cc7" integrity sha512-XWipOheGB4wai5JfCYXd6vwsWNwM/dirjRoZgAa7H2wd8ODWbli2AiKjqG8AYhyx+8+5FBEdpO92VhGlBydzbw== @@ -7939,65 +7977,65 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -jsii-diff@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jsii-diff/-/jsii-diff-1.3.2.tgz#1106f2e3374f339e283b9db7e4d83c96eb30be21" - integrity sha512-Wn93JYupqB/XtmLdkO9mj6eViz1zJm48x228cs3KBVxgzatnHfWE0SzNaZ0BZkl1uQrGPM8tHEGaI4HsHrGHNw== +jsii-diff@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsii-diff/-/jsii-diff-1.4.1.tgz#a4111869323940a693ce7a9a7c6559ade51dc6ee" + integrity sha512-7dtYd24w1UNDki0Uc7CJiv7oKoYAnKem1fSRDiEUVcAL1/9iNvYVGPMjUMMNx8RoRYln/oK3988AYB/h6VDxYw== dependencies: - "@jsii/spec" "^1.3.2" + "@jsii/spec" "^1.4.1" fs-extra "^9.0.0" - jsii-reflect "^1.3.2" + jsii-reflect "^1.4.1" log4js "^6.2.1" typescript "~3.8.3" yargs "^15.3.1" -jsii-pacmak@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.3.2.tgz#d3ec235cdcb32e6559cd9b4020165948cf74d001" - integrity sha512-WAhv7c11PmNWYfDK4GooBEfC6EcOQsqrR7ONbTftS0udJ6TCDNcJZHZ7ApiYvxSrGfNm42syD1g5Yo9dFktiew== +jsii-pacmak@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.4.1.tgz#ff119b51989b8b89edf2de983779727a43586f9e" + integrity sha512-2RSlhMDsXOoyJI9dCAXAZ29oHQhtJFfcmtfBP4CIz90HFk/UYQlEHz6Mj6E398XwEnSSRaDzu3DA2WEJPb4cNw== dependencies: - "@jsii/spec" "^1.3.2" + "@jsii/spec" "^1.4.1" clone "^2.1.2" - codemaker "^1.3.2" + codemaker "^1.4.1" commonmark "^0.29.1" escape-string-regexp "^3.0.0" fs-extra "^9.0.0" - jsii-reflect "^1.3.2" - jsii-rosetta "^1.3.2" + jsii-reflect "^1.4.1" + jsii-rosetta "^1.4.1" semver "^7.3.2" spdx-license-list "^6.2.0" xmlbuilder "^15.1.1" yargs "^15.3.1" -jsii-reflect@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jsii-reflect/-/jsii-reflect-1.3.2.tgz#1b9b83ec16cb9e5dcfb94ad6e1d7d9fafb7cc883" - integrity sha512-iwAoLJNZL6Sl8HqWm9Y2AfT0y2JHfhhPZFAFdjWR7f5MO3esn3hU1BJntxfwmRuat7z1kqFUx5p1QnoQ11oK7g== +jsii-reflect@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsii-reflect/-/jsii-reflect-1.4.1.tgz#c4f5ef4878ead129740e412e66411a2b74f2c5c8" + integrity sha512-Z4KK6ThkxwstPTaDLaWWn2y3YTCxOY1zOz3WJ2aQnrVNeEVs3Se084fEa44uXiidfq8e9kJ7npUeSMIgQuRDMQ== dependencies: - "@jsii/spec" "^1.3.2" + "@jsii/spec" "^1.4.1" colors "^1.4.0" fs-extra "^9.0.0" - oo-ascii-tree "^1.3.2" + oo-ascii-tree "^1.4.1" yargs "^15.3.1" -jsii-rosetta@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.3.2.tgz#d500ba5a137656e3aaf9ec87d7eb848af423eb03" - integrity sha512-V50M+/tEr6N1YLeGq5JHI2p/db0HqvzkFaL8MumpCbz5tCdhM1fmxp/8aJ8Dy4sCERkO/EA/rpbNbx08yNB/jw== +jsii-rosetta@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.4.1.tgz#50f41aff8066bdeecb6a85141a0bbed6fdf86517" + integrity sha512-6zDlsasizUOr4zLmRYPupL53ZAsk6Tcre/23hhrrMNcAazoe1wZtEa6UtpOm+qbwD67z2VgqcMTXcfFQvPEUAA== dependencies: - "@jsii/spec" "^1.3.2" + "@jsii/spec" "^1.4.1" commonmark "^0.29.1" fs-extra "^9.0.0" typescript "~3.8.3" xmldom "^0.3.0" yargs "^15.3.1" -jsii@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.3.2.tgz#82b049aec062c69f8c25b1fe469ddb8d2a5fee7a" - integrity sha512-71TX96GJPiXL3KI+h0MPdSwXirP09Zop71IAkxMsTJf091QdTP6dsjruqwYUosOAoiTuSbpz+6DXztvqKACkTg== +jsii@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.4.1.tgz#eaa166829fc90dfe6f207139170e6608a63221be" + integrity sha512-EMBPeLs52JgCujAuPuZb0MQX5Wa3h/XskyzJNKgP5NqSLrntKtXb9379g4W0RBF2+df4lJyXDfa6dr59jefi2g== dependencies: - "@jsii/spec" "^1.3.2" + "@jsii/spec" "^1.4.1" case "^1.6.3" colors "^1.4.0" deep-equal "^2.0.2" @@ -8150,6 +8188,24 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== +lambda-leak@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lambda-leak/-/lambda-leak-2.0.0.tgz#771985d3628487f6e885afae2b54510dcfb2cd7e" + integrity sha1-dxmF02KEh/boha+uK1RRDc+yzX4= + +lambda-tester@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/lambda-tester/-/lambda-tester-3.6.0.tgz#ceb7d4f4f0da768487a05cff37dcd088508b5247" + integrity sha512-F2ZTGWCLyIR95o/jWK46V/WnOCFAEUG/m/V7/CLhPJ7PCM+pror1rZ6ujP3TkItSGxUfpJi0kqwidw+M/nEqWw== + dependencies: + app-root-path "^2.2.1" + dotenv "^8.0.0" + dotenv-json "^1.0.0" + lambda-leak "^2.0.0" + semver "^6.1.1" + uuid "^3.3.2" + vandium-utils "^1.1.1" + lazystream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" @@ -8940,6 +8996,17 @@ nise@^4.0.1: just-extend "^4.0.2" path-to-regexp "^1.7.0" +nock@^11.7.0: + version "11.9.1" + resolved "https://registry.yarnpkg.com/nock/-/nock-11.9.1.tgz#2b026c5beb6d0dbcb41e7e4cefa671bc36db9c61" + integrity sha512-U5wPctaY4/ar2JJ5Jg4wJxlbBfayxgKbiAeGh+a1kk6Pwnc2ZEuKviLyDSG6t0uXl56q7AALIxoM6FJrBSsVXA== + dependencies: + debug "^4.1.0" + json-stringify-safe "^5.0.1" + lodash "^4.17.13" + mkdirp "^0.5.0" + propagate "^2.0.0" + nock@^12.0.3: version "12.0.3" resolved "https://registry.yarnpkg.com/nock/-/nock-12.0.3.tgz#83f25076dbc4c9aa82b5cdf54c9604c7a778d1c9" @@ -9392,10 +9459,10 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -oo-ascii-tree@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/oo-ascii-tree/-/oo-ascii-tree-1.3.2.tgz#eac9b058c83f0efd5566fa71ccf67bac40294b8f" - integrity sha512-nRkex03NnQ9f6cCWeW2Ar6qHRcVc3v4gN6ZRTU3UdlizagmL4CLgHzpdwcty+zpGT6VO6H0orE7SzX0rWFEjYw== +oo-ascii-tree@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/oo-ascii-tree/-/oo-ascii-tree-1.4.1.tgz#c48aa8afcb90863e9efcae9dbfa07d897c98e964" + integrity sha512-8bCnzfbDQvJCOirc77ISBjR0X8ziploaydwJyQD5ZgF6W6Nh3Ds3C8Q/95Lc095TBfDU+m+VZLxk3z3DgW/t+w== opener@^1.5.1: version "1.5.1" @@ -11026,7 +11093,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.1.5, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.4.0: +resolve@1.x, resolve@^1.1.5, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.4.0: version "1.16.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c" integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig== @@ -11195,7 +11262,7 @@ semver-intersect@^1.4.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@6.3.0, semver@6.x, semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@6.3.0, semver@6.x, semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -12366,7 +12433,7 @@ trivial-deferred@^1.0.1: resolved "https://registry.yarnpkg.com/trivial-deferred/-/trivial-deferred-1.0.1.tgz#376d4d29d951d6368a6f7a0ae85c2f4d5e0658f3" integrity sha1-N21NKdlR1jaKb3oK6FwvTV4GWPM= -ts-jest@^25.4.0: +ts-jest@^25.3.1, ts-jest@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-25.4.0.tgz#5ad504299f8541d463a52e93e5e9d76876be0ba4" integrity sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw== @@ -12799,6 +12866,11 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +vandium-utils@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/vandium-utils/-/vandium-utils-1.2.0.tgz#44735de4b7641a05de59ebe945f174e582db4f59" + integrity sha1-RHNd5LdkGgXeWevpRfF05YLbT1k= + vendors@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"