jsii-pacmak 1.118.0 → 1.119.0

package/lib/targets/python.js

@@ -31,6 +31,7 @@ const type_name_1 = require("./python/type-name");
 const util_2 = require("./python/util");
 const version_utils_1 = require("./version-utils");
 const rosetta_assembly_1 = require("../rosetta-assembly");
+const toposort_1 = require("../toposort");
 const index_1 = require("./index");
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-require-imports
 const spdxLicenseList = require('spdx-license-list');
@@ -318,8 +319,9 @@ class BasePythonClassType {
     }
     emit(code, context) {
         context = nestedContext(context, this.fqn);
-        const classParams = this.getClassParams(context);
-        openSignature(code, 'class', this.pythonName, classParams);
+        this.sortBasesForMro();
+        const baseClasses = this.getClassParams(context);
+        openSignature(code, 'class', this.pythonName, baseClasses);
         this.generator.emitDocString(code, this.apiLocation, this.docs, {
             documentableItem: `class-${this.pythonName}`,
             trailingNewLine: true,
@@ -343,6 +345,80 @@ class BasePythonClassType {
             context.emittedTypes.add(this.fqn);
         }
     }
+    /**
+     * Sort the this.bases array for proper Python MRO.
+     *
+     * If we don't do this, there is a chance that a superclass and subclass (or interface)
+     * have the parents in different order, which leads to an MRO violation.
+     *
+     * See: <https://docs.python.org/3/howto/mro.html>
+     *
+     * The bottom line is: child classes higher up in the hierarchy first.
+     * As an example, in the hierarchy:
+     *
+     * ```
+     *  ┌─────┐
+     *  │  A  │
+     *  └─────┘
+     *     ▲
+     *     ├─────┐
+     *     │  ┌─────┐
+     *     │  │  C  │
+     *     │  └─────┘
+     *     │     ▲
+     *     ├─────┘
+     *  ┌─────┐
+     *  │  B  │
+     *  └─────┘
+     * ```
+     *
+     * The order should be `class B(C, A)`, and not the other way around.
+     *
+     * This is yet another instance of topological sort.
+     */
+    sortBasesForMro() {
+        if (this.bases.length <= 1) {
+            return;
+        }
+        // Record original order
+        const originalOrder = new Map();
+        for (let i = 0; i < this.bases.length; i++) {
+            originalOrder.set(this.bases[i], i);
+        }
+        // Classify into sortable and non-sortable types
+        const sortableBases = [];
+        const nonSortableBases = [];
+        for (const baseRef of this.bases) {
+            if (spec.isNamedTypeReference(baseRef)) {
+                sortableBases.push(baseRef);
+            }
+            else {
+                nonSortableBases.push(baseRef);
+            }
+        }
+        // Toposort, in reverse (highest in the tree last)
+        const typeSystem = this.generator.reflectAssembly.system;
+        const sorted = (0, toposort_1.topologicalSort)(sortableBases, (t) => t.fqn, (d) => typeBaseFqns(typeSystem.findFqn(d.fqn)));
+        sorted.reverse();
+        // Inside a trance, we keep original sort order in the source declarations.
+        for (const tranche of sorted) {
+            tranche.sort((a, b) => originalOrder.get(a) - originalOrder.get(b));
+        }
+        // Replace original bases
+        this.bases.splice(0, this.bases.length, ...sorted.flatMap((xs) => xs), ...nonSortableBases);
+        function typeBaseFqns(x) {
+            if (x.isClassType()) {
+                return [
+                    ...(x.base ? [x.base?.fqn] : []),
+                    ...x.getInterfaces().map((i) => i.fqn),
+                ];
+            }
+            if (x.isInterfaceType()) {
+                return x.getInterfaces().map((i) => i.fqn);
+            }
+            return [];
+        }
+    }
     boundResolver(resolver) {
         if (this.fqn == null) {
             return resolver;
@@ -672,6 +748,7 @@ class BaseProperty {
 }
 class Interface extends BasePythonClassType {
     emit(code, context) {
+        this.sortBasesForMro();
         context = nestedContext(context, this.fqn);
         emitList(code, '@jsii.interface(', [`jsii_type="${this.fqn}"`], ')');
         // First we do our normal class logic for emitting our members.
@@ -749,6 +826,7 @@ class Struct extends BasePythonClassType {
         this.directMembers.push(member);
     }
     emit(code, context) {
+        this.sortBasesForMro();
         context = nestedContext(context, this.fqn);
         const baseInterfaces = this.getClassParams(context);
         code.indent('@jsii.data_type(');

package/lib/toposort.d.ts

@@ -34,5 +34,5 @@ export declare function topologicalSort<T>(xs: Iterable<T>, keyFn: KeyFunc<T>, d
  * We do declare the type `Toposorted<A>` here so that if we ever change
  * the type, we can find all usage sites quickly.
  */
-export type Toposorted<A> = readonly A[][];
+export type Toposorted<A> = A[][];
 //# sourceMappingURL=toposort.d.ts.map

package/lib/util.d.ts

@@ -132,4 +132,5 @@ export declare function filterAsync<A>(xs: A[], pred: (x: A) => Promise<boolean>
 export declare function wait(ms: number): Promise<void>;
 export declare function flatten<A>(xs: readonly A[][]): A[];
 export declare function zip<A, B>(xs: A[], ys: B[]): Array<[A, B]>;
+export declare function setAdd<T>(setA: Set<T>, setB: Iterable<T>): void;
 //# sourceMappingURL=util.d.ts.map

package/lib/util.js

@@ -14,6 +14,7 @@ exports.filterAsync = filterAsync;
 exports.wait = wait;
 exports.flatten = flatten;
 exports.zip = zip;
+exports.setAdd = setAdd;
 const child_process_1 = require("child_process");
 const fs = require("fs-extra");
 const os = require("os");
@@ -341,4 +342,9 @@ function zip(xs, ys) {
     }
     return ret;
 }
+function setAdd(setA, setB) {
+    for (const b of setB) {
+        setA.add(b);
+    }
+}
 //# sourceMappingURL=util.js.map

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.118.0 (build 02eec31)";
+export declare const VERSION_DESC = "1.119.0 (build 1634eac)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2025-10-29T09:48:29Z by generate.sh
+// Generated at 2025-11-10T14:25:15Z 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.118.0';
+exports.VERSION = '1.119.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.118.0 (build 02eec31)';
+exports.VERSION_DESC = '1.119.0 (build 1634eac)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.118.0",
+  "version": "1.119.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,24 +37,24 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.118.0",
-    "@jsii/spec": "1.118.0",
+    "@jsii/check-node": "1.119.0",
+    "@jsii/spec": "1.119.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.118.0",
+    "codemaker": "^1.119.0",
     "commonmark": "^0.31.2",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.118.0",
+    "jsii-reflect": "^1.119.0",
     "semver": "^7.7.2",
     "spdx-license-list": "^6.10.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.118.0",
-    "@jsii/go-runtime": "^1.118.0",
-    "@jsii/java-runtime": "^1.118.0",
-    "@scope/jsii-calc-lib": "^1.118.0",
+    "@jsii/dotnet-runtime": "^1.119.0",
+    "@jsii/go-runtime": "^1.119.0",
+    "@jsii/java-runtime": "^1.119.0",
+    "@scope/jsii-calc-lib": "^1.119.0",
     "@types/clone": "^2.1.4",
     "@types/commonmark": "^0.27.10",
     "@types/diff": "^5.2.3",
@@ -63,7 +63,7 @@
     "@types/yargs": "^17.0.33",
     "diff": "^5.2.0",
     "jsii": "^5.9.10",
-    "jsii-build-tools": "^1.118.0",
+    "jsii-build-tools": "^1.119.0",
     "jsii-calc": "^3.20.120",
     "jsii-rosetta": "~5.9.10",
     "pyright": "^1.1.403"