jsii-pacmak 1.101.0 → 1.103.0

package/lib/builder.js

@@ -49,6 +49,7 @@ class IndependentPackageBuilder {
         }
         catch (err) {
             logging.warn(`Failed building ${this.targetName}`);
+            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
             return await Promise.reject(err);
         }
         finally {

package/lib/index.js

@@ -79,6 +79,7 @@ async function pacmak({ argv = {}, clean = true, codeOnly = false, fingerprint =
             }))
                 .then(() => logging.info(`${targetSet.targetType} finished`), (err) => {
                 logging.warn(`${targetSet.targetType} failed`);
+                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                 return Promise.reject(err);
             });
         }, { parallel }));
@@ -135,7 +136,9 @@ function mapParallelOrSerial(collection, mapper, { parallel }) {
             ? // Running parallel, or first element
                 mapper(item)
             : // Wait for the previous promise, then make the next one
-                result[result.length - 1].then(() => mapper(item), (error) => Promise.reject(error)));
+                result[result.length - 1].then(() => mapper(item), 
+                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+                (error) => Promise.reject(error)));
     }
     return result;
 }

package/lib/targets/dotnet/dotnetgenerator.js

@@ -994,6 +994,7 @@ async function tryDownloadResource(urlText, into) {
                     fs.mkdirpSync(path.join(into, 'resources'));
                 }
                 catch (err) {
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                     return ko(err);
                 }
                 try {
@@ -1018,6 +1019,7 @@ async function tryDownloadResource(urlText, into) {
                                 offset += fs.writeSync(fd, buff, offset);
                             }
                             catch (err) {
+                                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                                 return ko(err);
                             }
                         }
@@ -1028,11 +1030,13 @@ async function tryDownloadResource(urlText, into) {
                             ok(filePath);
                         }
                         catch (err) {
+                            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                             ko(err);
                         }
                     });
                 }
                 catch (err) {
+                    // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                     return ko(err);
                 }
                 break;

package/lib/targets/go.js

@@ -42,6 +42,7 @@ class Golang extends target_1.Target {
         }
         catch (e) {
             logging.info(`[${pkgDir}] Content of ${localGoMod.path} file:\n${localGoMod.content}`);
+            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
             return Promise.reject(e);
         }
         if (process.env.JSII_BUILD_GO) {

package/lib/targets/python/requirements-dev.txt

@@ -3,7 +3,7 @@
 # be installed in the virtual environment used for building the distribution
 # package (wheel, sdist), but not declared as build-system dependencies.
 
-setuptools~=67.3.2 # build-system
+setuptools~=70.0.0 # build-system
 wheel~=0.42        # build-system
 
-twine~=5.0.0
+twine~=5.1.1

package/lib/targets/python/type-name.js

@@ -305,8 +305,8 @@ function getPackageName(fqn, rootAssm) {
     const assemblyName = segments[0];
     const config = assemblyName === rootAssm.name
         ? rootAssm
-        : rootAssm.dependencyClosure?.[assemblyName] ??
-            (0, util_1.die)(`Unable to find configuration for assembly "${assemblyName}" in dependency closure`);
+        : (rootAssm.dependencyClosure?.[assemblyName] ??
+            (0, util_1.die)(`Unable to find configuration for assembly "${assemblyName}" in dependency closure`));
     const rootPkg = config.targets?.python?.module ??
         (0, util_1.die)(`No Python target was configured in assembly "${assemblyName}"`);
     const pkg = new Array();

package/lib/targets/python.js

@@ -634,7 +634,7 @@ class BaseProperty {
         // PyRight and MyPY both special-case @property, but not custom implementations such as our @classproperty...
         // MyPY reports on the re-declaration, but PyRight reports on the initial declaration (duh!)
         this.isStatic && !this.immutable
-            ? 'pyright: ignore [reportGeneralTypeIssues]'
+            ? 'pyright: ignore [reportGeneralTypeIssues,reportRedeclaration]'
             : undefined);
         this.generator.emitDocString(code, this.apiLocation, this.docs, {
             documentableItem: `prop-${this.pythonName}`,
@@ -660,7 +660,10 @@ class BaseProperty {
             if ((this.shouldEmitBody || forceEmitBody) &&
                 (!renderAbstract || !this.abstract)) {
                 emitParameterTypeChecks(code, context, [`value: ${pythonType}`], `${this.pythonParent.fqn ?? this.pythonParent.pythonName}#${this.pythonName}`);
-                code.line(`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value)`);
+                // In case of a static setter, the 'cls' type is the class type but because we use a custom
+                // decorator to make the setter operate on classes instead of objects, pyright doesn't know about
+                // that and thinks the first argument is an instance instead of a class. Shut it up.
+                code.line(`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value) # pyright: ignore[reportArgumentType]`);
             }
             else {
                 code.line('...');
@@ -1188,7 +1191,28 @@ class PythonModule {
         code.line('import publication');
         code.line('import typing_extensions');
         code.line();
-        code.line('from typeguard import check_type');
+        code.line('import typeguard');
+        code.line('from importlib.metadata import version as _metadata_package_version');
+        code.line("TYPEGUARD_MAJOR_VERSION = int(_metadata_package_version('typeguard').split('.')[0])");
+        code.line();
+        code.openBlock('def check_type(argname: str, value: object, expected_type: typing.Any) -> typing.Any');
+        code.openBlock('if TYPEGUARD_MAJOR_VERSION <= 2');
+        code.line('return typeguard.check_type(argname=argname, value=value, expected_type=expected_type) # type:ignore');
+        code.closeBlock();
+        code.openBlock('else');
+        code.line('if isinstance(value, jsii._reference_map.InterfaceDynamicProxy): # pyright: ignore [reportAttributeAccessIssue]');
+        code.line('   pass');
+        code.openBlock('else');
+        code.openBlock('if TYPEGUARD_MAJOR_VERSION == 3');
+        code.line('typeguard.config.collection_check_strategy = typeguard.CollectionCheckStrategy.ALL_ITEMS # type:ignore');
+        code.line('typeguard.check_type(value=value, expected_type=expected_type) # type:ignore');
+        code.closeBlock();
+        code.openBlock('else');
+        code.line('typeguard.check_type(value=value, expected_type=expected_type, collection_check_strategy=typeguard.CollectionCheckStrategy.ALL_ITEMS) # type:ignore');
+        code.closeBlock();
+        code.closeBlock();
+        code.closeBlock();
+        code.closeBlock();
         // Determine if we need to write out the kernel load line.
         if (this.loadAssembly) {
             this.emitDependencyImports(code);
@@ -1471,7 +1495,7 @@ class Package {
             install_requires: [
                 `jsii${(0, version_utils_1.toPythonVersionRange)(`^${version_1.VERSION}`)}`,
                 'publication>=0.0.3',
-                'typeguard~=2.13.3',
+                'typeguard>=2.13.3,<5.0.0',
             ]
                 .concat(dependencies)
                 .sort(),

package/lib/version.d.ts

@@ -1,5 +1,5 @@
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 export declare const VERSION: string;
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.101.0 (build b95fe5d)";
+export declare const VERSION_DESC = "1.103.0 (build 3b9adc4)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2024-06-26T11:35:23Z by generate.sh
+// Generated at 2024-08-27T18:25:01Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-exports.VERSION = '1.101.0';
+exports.VERSION = '1.103.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.101.0 (build b95fe5d)';
+exports.VERSION_DESC = '1.103.0 (build 3b9adc4)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.101.0",
+  "version": "1.103.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,38 +37,38 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.101.0",
-    "@jsii/spec": "^1.101.0",
+    "@jsii/check-node": "1.103.0",
+    "@jsii/spec": "^1.103.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.101.0",
-    "commonmark": "^0.31.0",
+    "codemaker": "^1.103.0",
+    "commonmark": "^0.31.1",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.101.0",
-    "semver": "^7.6.0",
+    "jsii-reflect": "^1.103.0",
+    "semver": "^7.6.3",
     "spdx-license-list": "^6.9.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.101.0",
-    "@jsii/java-runtime": "^1.101.0",
-    "@jsii/go-runtime": "^1.101.0",
-    "@scope/jsii-calc-lib": "^1.101.0",
+    "@jsii/dotnet-runtime": "^1.103.0",
+    "@jsii/java-runtime": "^1.103.0",
+    "@jsii/go-runtime": "^1.103.0",
+    "@scope/jsii-calc-lib": "^1.103.0",
     "@types/clone": "^2.1.4",
-    "@types/diff": "^5.2.0",
+    "@types/diff": "^5.2.1",
     "@types/commonmark": "^0.27.9",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.5.8",
     "diff": "^5.2.0",
-    "jsii": "^1.101.0",
-    "jsii-build-tools": "^1.101.0",
+    "jsii": "^1.103.0",
+    "jsii-build-tools": "^1.103.0",
     "jsii-calc": "^3.20.120",
-    "jsii-rosetta": "^1.101.0",
-    "pyright": "^1.1.332"
+    "jsii-rosetta": "^1.103.0",
+    "pyright": "^1.1.377"
   },
   "peerDependencies": {
-    "jsii-rosetta": "^1.101.0 || ~5.2.0 || ~5.3.0 || ~5.4.0"
+    "jsii-rosetta": "^1.103.0 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0"
   },
   "keywords": [
     "jsii",