Merge branch 'master' into rmuller/fix-eagain-recursion

aws · Jun 10, 2020 · fc5bc91 · fc5bc91
2 parents fb4216c + 603e974
commit fc5bc91
Show file tree

Hide file tree

Showing 45 changed files with 491 additions and 138 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -6,7 +6,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch)$
       - -label~="contribution/core"
   - name: Tell them we're good now
     actions:

diff --git a/package.json b/package.json
@@ -17,11 +17,11 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-import-resolver-typescript": "^2.0.0",
-    "eslint-plugin-import": "^2.20.2",
-    "lerna": "^3.22.0",
+    "eslint-plugin-import": "^2.21.1",
+    "lerna": "^3.22.1",
     "standard-version": "^8.0.0"
   },
   "repository": {

diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@jsii/dotnet-runtime": "^0.0.0",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "jsii-calc": "^0.0.0",
     "jsii-pacmak": "^0.0.0",
     "typescript": "~3.8.3"

diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/semver": "^7.2.0",
     "jsii-build-tools": "^0.0.0",
     "semver": "^7.3.2",

diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
@@ -17,9 +17,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@octokit/rest": "^17.9.2",
+    "@octokit/rest": "^17.11.0",
     "dotenv": "^8.2.0",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^9.0.1",
     "jest": "^26.0.1",
     "jsii": "^0.0.0",
     "jsii-pacmak": "^0.0.0",
@@ -30,9 +30,9 @@
     "@types/dotenv": "^8.2.0",
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.3",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/tar": "^4.0.3",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "prettier": "^1.19.1",

diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "jsii-build-tools": "^0.0.0",
     "typescript": "~3.8.3"
   }

diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@jsii/spec": "^0.0.0",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^9.0.1",
     "source-map": "^0.7.3",
     "tar": "^6.0.2"
   },
@@ -42,9 +42,9 @@
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.3",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/tar": "^4.0.3",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/@jsii/python-runtime/bin/generate-calc b/packages/@jsii/python-runtime/bin/generate-calc
@@ -34,7 +34,6 @@ subprocess.run(
         "-m",
         "pip",
         "install",
-        "--force-reinstall",
         "--upgrade",
     ]
     +

diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json
@@ -27,8 +27,10 @@
     "dist-clean": "rm -rf dist",
     "build": "cp ../../../README.md . && rm -f jsii-*.whl && npm run generate && npm run deps",
     "package": "package-python && package-private",
-    "test": ".env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy",
-    "test:update": "UPDATE_DIFF=1 .env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy"
+    "test": "npm run test:gen && npm run test:run",
+    "test:gen": ".env/bin/python bin/generate-calc",
+    "test:run": ".env/bin/py.test -v --mypy",
+    "test:update": "UPDATE_DIFF=1 npm run test"
   },
   "dependencies": {
     "@jsii/runtime": "^0.0.0"

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
@@ -1,2 +1,3 @@
 pytest
 pytest-mypy
+.
diff --git a/packages/@jsii/python-runtime/src/jsii/_kernel/__init__.py b/packages/@jsii/python-runtime/src/jsii/_kernel/__init__.py
@@ -233,6 +233,10 @@ def create(
             obj.__jsii_ref__ =  _callback_till_result(self, response, CreateResponse)
         else:
             obj.__jsii_ref__ = response
+
+        # Register this to the reference map already (so it's available within the rest of the __init__)
+        _reference_map.register_reference(obj)
+
         return obj.__jsii_ref__
 
     def delete(self, ref: ObjRef) -> None:

diff --git a/packages/@jsii/python-runtime/tests/test_compliance.py b/packages/@jsii/python-runtime/tests/test_compliance.py
@@ -37,6 +37,7 @@
     InterfaceCollections,
     IInterfaceWithProperties,
     IStructReturningDelegate,
+    Isomorphism,
     JsiiAgent,
     JSObjectLiteralForInterface,
     JSObjectLiteralToNative,
@@ -1196,3 +1197,12 @@ def test_parameter_named_self_ClassWithSelf():
 def test_parameter_named_self_ClassWithSelfKwarg():
     subject = ClassWithSelfKwarg(self='Howdy!')
     assert subject.props.self == 'Howdy!'
+
+
+def test_isomorphism_within_constructor():
+    class Subject(Isomorphism):
+        def __init__(self):
+            super().__init__()
+            assert self == self.myself()
+
+    Subject()
diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
@@ -41,8 +41,8 @@
     "@scope/jsii-calc-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/jest": "^25.2.3",
-    "@types/node": "^10.17.24",
-    "eslint": "^7.1.0",
+    "@types/node": "^10.17.26",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
@@ -35,8 +35,8 @@
   },
   "devDependencies": {
     "@types/jest": "^25.2.3",
-    "@types/node": "^10.17.24",
-    "eslint": "^7.1.0",
+    "@types/node": "^10.17.26",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json
@@ -29,7 +29,7 @@
     "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
   },
   "devDependencies": {
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jsii": "^0.0.0",

diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json
@@ -35,7 +35,7 @@
     "@scope/jsii-calc-base-of-base": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jsii": "^0.0.0",

diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json
@@ -38,7 +38,7 @@
     "@scope/jsii-calc-base-of-base": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jsii": "^0.0.0",

diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
@@ -33,14 +33,14 @@
   "dependencies": {
     "camelcase": "^6.0.0",
     "decamelize": "^1.2.0",
-    "fs-extra": "^9.0.0"
+    "fs-extra": "^9.0.1"
   },
   "devDependencies": {
     "@types/decamelize": "^1.2.0",
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.3",
-    "@types/node": "^10.17.24",
-    "eslint": "^7.1.0",
+    "@types/node": "^10.17.26",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -2490,3 +2490,15 @@ export class InterfaceCollections {
 export interface IOptionalMethod {
     optional(): string | undefined;
 }
+
+/**
+ * Checks the "same instance" isomorphism is preserved within the constructor.
+ *
+ * Create a subclass of this, and assert that `this.myself()` actually returns
+ * `this` from within the constructor.
+ */
+export abstract class Isomorphism {
+    public myself(): Isomorphism {
+        return this;
+    }
+}
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
@@ -47,7 +47,7 @@
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jsii": "^0.0.0",

diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -6566,6 +6566,40 @@
       ],
       "name": "InterfacesMaker"
     },
+    "jsii-calc.Isomorphism": {
+      "abstract": true,
+      "assembly": "jsii-calc",
+      "docs": {
+        "remarks": "Create a subclass of this, and assert that `this.myself()` actually returns\n`this` from within the constructor.",
+        "stability": "experimental",
+        "summary": "Checks the \"same instance\" isomorphism is preserved within the constructor."
+      },
+      "fqn": "jsii-calc.Isomorphism",
+      "initializer": {},
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/compliance.ts",
+        "line": 2500
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "experimental"
+          },
+          "locationInModule": {
+            "filename": "lib/compliance.ts",
+            "line": 2501
+          },
+          "name": "myself",
+          "returns": {
+            "type": {
+              "fqn": "jsii-calc.Isomorphism"
+            }
+          }
+        }
+      ],
+      "name": "Isomorphism"
+    },
     "jsii-calc.JSII417Derived": {
       "assembly": "jsii-calc",
       "base": "jsii-calc.JSII417PublicBaseOfBase",
@@ -13128,5 +13162,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "5SbCJfv1kDW24DUhPcwzoQ1k7Moq+rKOB+Q4TSZlKPE="
+  "fingerprint": "miVjqwWxNOLMY7fR23c/SVvfiGqkgqLgG+18qp4f8MM="
 }
diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
@@ -22,9 +22,9 @@
     "@types/inquirer": "^6.5.0",
     "@types/jest": "^25.2.3",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/yargs": "^15.0.5",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@jsii/spec": "^0.0.0",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^9.0.1",
     "jsii-reflect": "^0.0.0",
     "log4js": "^6.3.0",
     "typescript": "~3.8.3",
@@ -44,10 +44,10 @@
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.3",
     "@types/jest-expect-message": "^1.0.2",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/tar-fs": "^2.0.0",
     "@types/yargs": "^15.0.5",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",

diff --git a/packages/jsii-pacmak/lib/targets/version-utils.ts b/packages/jsii-pacmak/lib/targets/version-utils.ts
@@ -60,11 +60,18 @@ function toBracketNotation(
   suffix?: string,
   { semver = true }: { semver?: boolean } = {},
 ): string {
+  if (semverRange === '*') {
+    semverRange = '>=0.0.0';
+  }
   const range = new Range(semverRange);
   return range.set
     .map((set) => {
       if (set.length === 1) {
         const version = set[0].semver.raw;
+        if (!version && range.raw === '>=0.0.0') {
+          // Case where version is '*'
+          return `[0.0.0,]`;
+        }
         switch (set[0].operator || '=') {
           // "[version]" => means exactly version
           case '=':

diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
@@ -40,7 +40,7 @@
     "codemaker": "^0.0.0",
     "commonmark": "^0.29.1",
     "escape-string-regexp": "^4.0.0",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^9.0.1",
     "jsii-reflect": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
     "semver": "^7.3.2",
@@ -57,10 +57,10 @@
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.3",
     "@types/mock-fs": "^4.10.0",
-    "@types/node": "^10.17.24",
+    "@types/node": "^10.17.26",
     "@types/semver": "^7.2.0",
     "@types/yargs": "^15.0.5",
-    "eslint": "^7.1.0",
+    "eslint": "^7.2.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.0.1",