jsii-pacmak 1.95.0 → 1.97.0

package/lib/targets/python.js

@@ -1165,6 +1165,18 @@ class PythonModule {
         };
         // Before we write anything else, we need to write out our module headers, this
         // is where we handle stuff like imports, any required initialization, etc.
+        // If multiple packages use the same namespace (in Python, a directory) it
+        // depends on how they are laid out on disk if deep imports of multiple packages
+        // will succeed. `pip` merges all packages into the same directory, and deep
+        // imports work automatically. `bazel` puts packages into different directories,
+        // and `import aws_cdk.subpackage` will fail if `aws_cdk/__init__.py` and
+        // `aws_cdk/subpackage/__init__.py` are not in the same directory.
+        //
+        // We can get around this by using `pkgutil` to extend the search path for the
+        // current module (`__path__`) with all packages found on `sys.path`.
+        code.line('from pkgutil import extend_path');
+        code.line('__path__ = extend_path(__path__, __name__)');
+        code.line();
         code.line('import abc');
         code.line('import builtins');
         code.line('import datetime');

package/lib/targets/version-utils.js

@@ -81,30 +81,54 @@ function toReleaseVersion(assemblyVersion, target) {
     }
     switch (target) {
         case _1.TargetName.PYTHON:
+            const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
             // Python supports a limited set of identifiers... And we have a mapping table...
             // https://packaging.python.org/guides/distributing-packages-using-setuptools/#pre-release-versioning
-            const [label, sequence, ...rest] = version.prerelease;
-            if (rest.filter((elt) => elt !== 0).length > 0 || sequence == null) {
-                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) components to python: ${(0, util_1.inspect)(version.prerelease)}. The format should be 'X.Y.Z-label.sequence', where sequence is a positive integer, and label is "dev", "pre", "alpha", beta", or "rc"`);
-            }
-            if (!Number.isInteger(sequence)) {
-                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as sequence ${(0, util_1.inspect)(sequence)} is not an integer`);
-            }
-            const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
-            // See PEP 440: https://www.python.org/dev/peps/pep-0440/#pre-releases
-            switch (label) {
-                case 'dev':
-                case 'pre':
-                    return `${baseVersion}.dev${sequence}`;
-                case 'alpha':
-                    return `${baseVersion}.a${sequence}`;
-                case 'beta':
-                    return `${baseVersion}.b${sequence}`;
-                case 'rc':
-                    return `${baseVersion}.rc${sequence}`;
-                default:
-                    throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as label ${(0, util_1.inspect)(label)} is not mapped (only "dev", "pre", "alpha", "beta" and "rc" are)`);
+            const releaseLabels = {
+                alpha: 'a',
+                beta: 'b',
+                rc: 'rc',
+                post: 'post',
+                dev: 'dev',
+                pre: 'pre',
+            };
+            const validationErrors = [];
+            // Ensure that prerelease composed entirely of [label, sequence] pairs
+            version.prerelease.forEach((elem, idx, arr) => {
+                const next = arr[idx + 1];
+                if (typeof elem === 'string') {
+                    if (!Object.keys(releaseLabels).includes(elem)) {
+                        validationErrors.push(`Label ${elem} is not one of ${Object.keys(releaseLabels).join(',')}`);
+                    }
+                    if (next === undefined || !Number.isInteger(next)) {
+                        validationErrors.push(`Label ${elem} must be followed by a positive integer`);
+                    }
+                }
+            });
+            if (validationErrors.length > 0) {
+                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) components to python: ${(0, util_1.inspect)(version.prerelease)}. The format should be 'X.Y.Z-[label.sequence][.post.sequence][.(dev|pre).sequence]', where sequence is a positive integer and label is one of ${(0, util_1.inspect)(Object.keys(releaseLabels))}. Validation errors encountered: ${validationErrors.join(', ')}`);
             }
+            // PEP440 supports multiple labels in a given version, so
+            // we should attempt to identify and map as many labels as
+            // possible from the given prerelease input
+            // e.g. 1.2.3-rc.123.dev.456.post.789 => 1.2.3.rc123.dev456.post789
+            const postIdx = version.prerelease.findIndex((v) => v.toString() === 'post');
+            const devIdx = version.prerelease.findIndex((v) => ['dev', 'pre'].includes(v.toString()));
+            const preReleaseIdx = version.prerelease.findIndex((v) => ['alpha', 'beta', 'rc'].includes(v.toString()));
+            const prereleaseVersion = [
+                preReleaseIdx > -1
+                    ? `${releaseLabels[version.prerelease[preReleaseIdx]]}${version.prerelease[preReleaseIdx + 1] ?? 0}`
+                    : undefined,
+                postIdx > -1
+                    ? `post${version.prerelease[postIdx + 1] ?? 0}`
+                    : undefined,
+                devIdx > -1 ? `dev${version.prerelease[devIdx + 1] ?? 0}` : undefined,
+            ]
+                .filter((v) => v)
+                .join('.');
+            return version.build.length > 0
+                ? `${baseVersion}.${prereleaseVersion}+${version.build.join('.')}`
+                : `${baseVersion}.${prereleaseVersion}`;
         case _1.TargetName.DOTNET:
         case _1.TargetName.GO:
         case _1.TargetName.JAVA:

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.95.0 (build f1ff514)";
+export declare const VERSION_DESC = "1.97.0 (build 729de35)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2024-03-05T08:25:19Z by generate.sh
+// Generated at 2024-04-08T20:13:17Z 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.95.0';
+exports.VERSION = '1.97.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.95.0 (build f1ff514)';
+exports.VERSION_DESC = '1.97.0 (build 729de35)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.95.0",
+  "version": "1.97.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,33 +37,33 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.95.0",
-    "@jsii/spec": "^1.95.0",
+    "@jsii/check-node": "1.97.0",
+    "@jsii/spec": "^1.97.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.95.0",
+    "codemaker": "^1.97.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.95.0",
-    "jsii-rosetta": "^1.95.0",
+    "jsii-reflect": "^1.97.0",
+    "jsii-rosetta": "^1.97.0",
     "semver": "^7.5.4",
     "spdx-license-list": "^6.8.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.95.0",
-    "@jsii/java-runtime": "^1.95.0",
-    "@jsii/go-runtime": "^1.95.0",
-    "@scope/jsii-calc-lib": "^1.95.0",
+    "@jsii/dotnet-runtime": "^1.97.0",
+    "@jsii/java-runtime": "^1.97.0",
+    "@jsii/go-runtime": "^1.97.0",
+    "@scope/jsii-calc-lib": "^1.97.0",
     "@types/clone": "^2.1.4",
     "@types/diff": "^5.0.8",
     "@types/commonmark": "^0.27.9",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.5.5",
     "diff": "^5.1.0",
-    "jsii": "^1.95.0",
-    "jsii-build-tools": "^1.95.0",
+    "jsii": "^1.97.0",
+    "jsii-build-tools": "^1.97.0",
     "jsii-calc": "^3.20.120",
     "pyright": "^1.1.332"
   },