Merge pull request #1637 from aws/bump/1.5.0

chore(release): 1.5.0
aws · May 7, 2020 · 46538f8 · 46538f8
2 parents 0b09d7b + e30ec04
commit 46538f8
Show file tree

Hide file tree

Showing 54 changed files with 2,101 additions and 646 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.5.0](https://github.com/aws/jsii/compare/v1.4.1...v1.5.0) (2020-05-07)
+
+
+### Bug Fixes
+
+* **jsii:** unable to use type from dependencies' submodules ([#1557](https://github.com/aws/jsii/issues/1557)) ([ba7fac2](https://github.com/aws/jsii/commit/ba7fac25c4e625f4beb1bcc74a39d1c5e75441c1))
+
 ## [1.4.1](https://github.com/aws/jsii/compare/v1.4.0...v1.4.1) (2020-04-22)
 
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.4.1"
+  "version": "1.5.0"
 }
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
     "test:update": "lerna run test:update --stream"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.29.0",
-    "@typescript-eslint/parser": "^2.29.0",
+    "@typescript-eslint/eslint-plugin": "^2.31.0",
+    "@typescript-eslint/parser": "^2.31.0",
     "eslint": "^6.8.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-import-resolver-typescript": "^2.0.0",

diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
@@ -16,14 +16,14 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@octokit/rest": "^17.5.1",
+    "@octokit/rest": "^17.7.0",
     "dotenv": "^8.2.0",
     "fs-extra": "^9.0.0",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "jsii": "^0.0.0",
     "jsii-pacmak": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "tar": "^6.0.1"
+    "tar": "^6.0.2"
   },
   "devDependencies": {
     "@types/dotenv": "^8.2.0",

diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
@@ -33,18 +33,18 @@
     "@jsii/spec": "^0.0.0",
     "fs-extra": "^9.0.0",
     "source-map": "^0.7.3",
-    "tar": "^6.0.1"
+    "tar": "^6.0.2"
   },
   "devDependencies": {
     "@scope/jsii-calc-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.2.1",
-    "@types/jest-expect-message": "^1.0.1",
+    "@types/jest-expect-message": "^1.0.2",
     "@types/node": "^10.17.21",
     "@types/tar": "^4.0.3",
     "eslint": "^6.8.0",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",

diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
@@ -42,7 +42,7 @@
     "@types/jest": "^25.2.1",
     "@types/node": "^10.17.21",
     "eslint": "^6.8.0",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",
     "source-map": "^0.7.3",

diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
@@ -36,7 +36,7 @@
     "@types/jest": "^25.2.1",
     "@types/node": "^10.17.21",
     "eslint": "^6.8.0",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "jsii-build-tools": "^0.0.0",
     "typescript": "~3.8.3",
     "typescript-json-schema": "^0.42.0"

diff --git a/packages/@scope/jsii-calc-lib/lib/index.ts b/packages/@scope/jsii-calc-lib/lib/index.ts
@@ -107,4 +107,6 @@ export enum EnumFromScopedModule {
  */
 export interface IThreeLevelsInterface extends base.IBaseInterface {
     baz(): void;
-}
+}
+
+export * as submodule from './submodule';
diff --git a/packages/@scope/jsii-calc-lib/lib/submodule/index.ts b/packages/@scope/jsii-calc-lib/lib/submodule/index.ts
@@ -0,0 +1,22 @@
+export interface IReflectable {
+  readonly entries: ReflectableEntry[];
+}
+
+export interface ReflectableEntry {
+  readonly key: string;
+  readonly value: unknown;
+}
+
+export class Reflector {
+  public constructor() { }
+
+  public asMap(reflectable: IReflectable): Record<string, unknown> {
+    return reflectable.entries.reduce(
+      (mapping, entry) => {
+        mapping[entry.key] = entry.value;
+        return mapping;
+      },
+      {} as Record<string, unknown>,
+    );
+  }
+}
diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii
@@ -72,6 +72,14 @@
     "url": "https://github.com/aws/jsii.git"
   },
   "schema": "jsii/0.10.0",
+  "submodules": {
+    "@scope/jsii-calc-lib.submodule": {
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 112
+      }
+    }
+  },
   "targets": {
     "dotnet": {
       "namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
@@ -514,8 +522,140 @@
           }
         }
       ]
+    },
+    "@scope/jsii-calc-lib.submodule.IReflectable": {
+      "assembly": "@scope/jsii-calc-lib",
+      "docs": {
+        "stability": "deprecated"
+      },
+      "fqn": "@scope/jsii-calc-lib.submodule.IReflectable",
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/submodule/index.ts",
+        "line": 1
+      },
+      "name": "IReflectable",
+      "namespace": "submodule",
+      "properties": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "deprecated"
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/submodule/index.ts",
+            "line": 2
+          },
+          "name": "entries",
+          "type": {
+            "collection": {
+              "elementtype": {
+                "fqn": "@scope/jsii-calc-lib.submodule.ReflectableEntry"
+              },
+              "kind": "array"
+            }
+          }
+        }
+      ]
+    },
+    "@scope/jsii-calc-lib.submodule.ReflectableEntry": {
+      "assembly": "@scope/jsii-calc-lib",
+      "datatype": true,
+      "docs": {
+        "stability": "deprecated"
+      },
+      "fqn": "@scope/jsii-calc-lib.submodule.ReflectableEntry",
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/submodule/index.ts",
+        "line": 5
+      },
+      "name": "ReflectableEntry",
+      "namespace": "submodule",
+      "properties": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "deprecated"
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/submodule/index.ts",
+            "line": 6
+          },
+          "name": "key",
+          "type": {
+            "primitive": "string"
+          }
+        },
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "deprecated"
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/submodule/index.ts",
+            "line": 7
+          },
+          "name": "value",
+          "type": {
+            "primitive": "any"
+          }
+        }
+      ]
+    },
+    "@scope/jsii-calc-lib.submodule.Reflector": {
+      "assembly": "@scope/jsii-calc-lib",
+      "docs": {
+        "stability": "deprecated"
+      },
+      "fqn": "@scope/jsii-calc-lib.submodule.Reflector",
+      "initializer": {
+        "docs": {
+          "stability": "deprecated"
+        }
+      },
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/submodule/index.ts",
+        "line": 10
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "deprecated"
+          },
+          "locationInModule": {
+            "filename": "lib/submodule/index.ts",
+            "line": 13
+          },
+          "name": "asMap",
+          "parameters": [
+            {
+              "name": "reflectable",
+              "type": {
+                "fqn": "@scope/jsii-calc-lib.submodule.IReflectable"
+              }
+            }
+          ],
+          "returns": {
+            "type": {
+              "collection": {
+                "elementtype": {
+                  "primitive": "any"
+                },
+                "kind": "map"
+              }
+            }
+          }
+        }
+      ],
+      "name": "Reflector",
+      "namespace": "submodule"
     }
   },
   "version": "0.0.0",
-  "fingerprint": "7VgHmQKZ2ceAa99bmuocZRLFxQths+Sf35amRt1SZpE="
+  "fingerprint": "+7cEXNA9wAn/mht3AcwDtIFLvsfZoQhQGBQ4J1pPCO4="
 }
diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
@@ -40,7 +40,7 @@
     "@types/jest": "^25.2.1",
     "@types/node": "^10.17.21",
     "eslint": "^6.8.0",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
     "typescript": "~3.8.3"
   },
   "jest": {

diff --git a/packages/jsii-calc/lib/index.ts b/packages/jsii-calc/lib/index.ts
@@ -3,5 +3,6 @@ export * from './compliance';
 export * from './documented';
 export * from './erasures';
 export * from './stability';
+export * from './submodules';
 
 export * as submodule from './submodule';
diff --git a/packages/jsii-calc/lib/submodules.ts b/packages/jsii-calc/lib/submodules.ts
@@ -0,0 +1,15 @@
+import { submodule } from '@scope/jsii-calc-lib';
+
+/**
+ * Ensures submodule-imported types from dependencies can be used correctly.
+ */
+export class UpcasingReflectable implements submodule.IReflectable {
+  public static readonly reflector = new submodule.Reflector();
+
+  public constructor(private readonly delegate: Record<string, unknown>) { }
+
+  public get entries(): submodule.ReflectableEntry[] {
+      return Object.entries(this.delegate)
+          .map(([key, value]) => ({ key: key.toLocaleUpperCase(), value }));
+  }
+}