jsii-pacmak 1.67.0 → 1.69.0

package/lib/targets/dotnet/runtime-type-checking.js

@@ -98,6 +98,24 @@ class Validation {
                 code.openBlock(`switch (${expression})`);
                 for (const type of types) {
                     validTypes.push(resolver.toDotNetTypeName(type.spec));
+                    /**
+                     * Filter to remove classes and interfaces from a set of type references that
+                     * are implied by another entry in the set. Practically this is meant to remove
+                     * types from a set if a parent type of it is also present in the set, keeping
+                     * only the most generic declaration.
+                     *
+                     * This is useful because the TypeScript compiler and jsii do not guarantee that
+                     * all entries in a type union are unrelated, but the C# compiler treats dead
+                     * code as an error, and will refuse to compile (error CS8120) a pattern-matching
+                     * switch case if it cannot be matched (for example, if it matches on a child of
+                     * a type that was previously matched on already).
+                     */
+                    if ((type.type?.isClassType() || type.type?.isInterfaceType()) &&
+                        types.some((other) => other !== type &&
+                            other.type != null &&
+                            type.type.extends(other.type))) {
+                        continue;
+                    }
                     const typeNames = [resolver.toDotNetType(type.spec)];
                     if (typeNames[0] === 'double') {
                         // For doubles, we accept any numeric value, really...

package/lib/targets/go/package.d.ts

@@ -55,6 +55,7 @@ export declare class RootPackage extends Package {
     readonly assembly: Assembly;
     readonly version: string;
     private readonly versionFile;
+    private readonly typeCache;
     private readonly rootPackageCache;
     constructor(assembly: Assembly, rootPackageCache?: Map<string, RootPackage>);
     emit(context: EmitContext): void;

package/lib/targets/go/package.js

@@ -263,6 +263,7 @@ class RootPackage extends Package {
         const moduleName = goConfig.moduleName ?? '';
         const version = `${assembly.version}${goConfig.versionSuffix ?? ''}`;
         super(assembly, packageName, filePath, moduleName, version);
+        this.typeCache = new Map();
         this.rootPackageCache = rootPackageCache;
         this.rootPackageCache.set(assembly.name, this);
         this.assembly = assembly;
@@ -315,12 +316,15 @@ class RootPackage extends Package {
      * This allows resolving type references from other JSII modules
      */
     findType(fqn) {
-        return this.packageDependencies.reduce((accum, current) => {
-            if (accum) {
-                return accum;
-            }
-            return current.findType(fqn);
-        }, super.findType(fqn));
+        if (!this.typeCache.has(fqn)) {
+            this.typeCache.set(fqn, this.packageDependencies.reduce((accum, current) => {
+                if (accum) {
+                    return accum;
+                }
+                return current.findType(fqn);
+            }, super.findType(fqn)));
+        }
+        return this.typeCache.get(fqn);
     }
     /*
      * Get all JSII module dependencies of the package being generated

package/lib/targets/python.js

@@ -1218,11 +1218,12 @@ class PythonModule {
                         `${JSON.stringify(this.assemblyFilename)}`,
                     ], ')');
                     code.line();
-                    emitList(code, '__jsii_assembly__.invokeBinScript(', [
+                    emitList(code, 'exit_code = __jsii_assembly__.invokeBinScript(', [
                         JSON.stringify(this.assembly.name),
                         JSON.stringify(name),
                         'sys.argv[1:]',
                     ], ')');
+                    code.line('exit(exit_code)');
                     code.closeFile(script_file);
                     scripts.push(script_file.replace(/\\/g, '/'));
                 }

package/lib/version.d.ts

@@ -1,5 +1,5 @@
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
 export declare const VERSION: string;
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.67.0 (build 2c027f5)";
+export declare const VERSION_DESC = "1.69.0 (build f656c31)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2022-09-02T16:06:26Z by generate.sh
+// Generated at 2022-09-27T10:46:56Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-exports.VERSION = '1.67.0';
+exports.VERSION = '1.69.0';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.67.0 (build 2c027f5)';
+exports.VERSION_DESC = '1.69.0 (build f656c31)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.67.0",
+  "version": "1.69.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,35 +37,35 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.67.0",
-    "@jsii/spec": "^1.67.0",
+    "@jsii/check-node": "1.69.0",
+    "@jsii/spec": "^1.69.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.67.0",
+    "codemaker": "^1.69.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.67.0",
-    "jsii-rosetta": "^1.67.0",
+    "jsii-reflect": "^1.69.0",
+    "jsii-rosetta": "^1.69.0",
     "semver": "^7.3.7",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.67.0",
-    "@jsii/java-runtime": "^1.67.0",
-    "@jsii/go-runtime": "^1.67.0",
-    "@scope/jsii-calc-lib": "^1.67.0",
+    "@jsii/dotnet-runtime": "^1.69.0",
+    "@jsii/java-runtime": "^1.69.0",
+    "@jsii/go-runtime": "^1.69.0",
+    "@scope/jsii-calc-lib": "^1.69.0",
     "@types/clone": "^2.1.1",
     "@types/diff": "^5.0.2",
     "@types/commonmark": "^0.27.5",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.3.12",
     "diff": "^5.1.0",
-    "jsii": "^1.67.0",
-    "jsii-build-tools": "^1.67.0",
+    "jsii": "^1.69.0",
+    "jsii-build-tools": "^1.69.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.268"
+    "pyright": "^1.1.272"
   },
   "keywords": [
     "jsii",