jsii-pacmak 1.122.0 → 1.124.0

package/lib/targets/dotnet/nameutils.js

@@ -77,6 +77,14 @@ class DotNetNameUtils {
             throw new Error(`Invalid parameter name: ${original}`);
         }
         const name = (0, codemaker_1.toCamelCase)(original);
+        if (!name) {
+            // toCamelCase will return an empty string from a string like `_(_+)`. Confirm that
+            // that is what is happening, then return the original string.
+            if (original.match(/^__+$/)) {
+                return original;
+            }
+            throw new Error(`toCamelCase returns an empty string from: ${JSON.stringify(original)}`);
+        }
         return this.escapeParameterName(name);
     }
     capitalizeWord(original) {

package/lib/targets/java.js

@@ -355,8 +355,22 @@ class JavaGenerator extends generator_1.Generator {
             return propertyName;
         }
         if (propertyName === '_') {
-            // Slightly different pattern for this one
-            return '__';
+            // Slightly different pattern for this one. We used to generate `__` here
+            // but it's somewhat likely that people will use `_, __, ___` as multiple
+            // indifferent arguments, so we pick a different name.
+            //
+            // Ideally we would look at the alternative argument names and pick
+            // something guaranteed to be unique, but unfortunately the code isn't
+            // quite structured that way so we'll pick something unlikely to collide
+            // instead.
+            //
+            // Changing from `__` -> `_under` would be a breaking change if applied to
+            // public property names, but most likely this will be used for function
+            // parameters (unfortunately the code has been structured in such a way
+            // that property and parameter names are strongly tied together, in a way
+            // that would take more time to unwind than I care to invest right now),
+            // where it doesn't matter.
+            return '_under_';
         }
         if (JavaGenerator.RESERVED_KEYWORDS.includes(propertyName)) {
             return `${propertyName}Value`;
@@ -454,9 +468,9 @@ class JavaGenerator extends generator_1.Generator {
             throw new Error('Cannot have generic type arguments to a constructor');
         }
         // NOTE: even though a constructor is technically final and we COULD render covariant types, historically we didn't and I'm not changing it.
-        this.code.openBlock(`${initializerAccessLevel} ${cls.name}(${this.renderParameters(method.parameters, types, 'final-but-not-cov')})`);
+        this.code.openBlock(`${initializerAccessLevel} ${cls.name}(${this.renderParameters(method.parameters, types, 'exact-types')})`);
         this.code.line('super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);');
-        this.emitUnionParameterValidation(method.parameters);
+        this.emitUnionParameterValidation(method.parameters, 'exact-types');
         this.code.line(`software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this${this.renderMethodCallArguments(method)});`);
         this.code.closeBlock();
     }
@@ -583,7 +597,7 @@ class JavaGenerator extends generator_1.Generator {
         });
         this.emitStabilityAnnotations(method);
         const types = this.convertTypes(method.parameters);
-        this.code.line(`${typeVarDeclarations(types)}${displayStatic(returnType)} ${methodName}(${this.renderParameters(method.parameters, types, 'overridable')});`);
+        this.code.line(`${typeVarDeclarations(types)}${displayStatic(returnType)} ${methodName}(${this.renderParameters(method.parameters, types, 'exact-types')});`);
     }
     onInterfaceMethodOverload(ifc, overload, _originalMethod) {
         this.onInterfaceMethod(ifc, overload);
@@ -1066,7 +1080,7 @@ class JavaGenerator extends generator_1.Generator {
                                 name: 'value',
                                 type: this.filterType(prop, type),
                             },
-                        ]);
+                        ], 'exact-types');
                     }
                     if (prop.static) {
                         statement += `software.amazon.jsii.JsiiObject.jsiiStaticSet(${displayStatic(javaClass)}.class, `;
@@ -1120,7 +1134,8 @@ class JavaGenerator extends generator_1.Generator {
         const async = !!method.async;
         const methodName = JavaGenerator.safeJavaMethodName(method.name);
         const types = this.convertTypes(method.parameters);
-        const signature = `${typeVarDeclarations(types)}${displayStatic(returnType)} ${methodName}(${this.renderParameters(method.parameters, types, method.static ? 'final' : 'overridable')})`;
+        const covariance = covarianceFromOverridability(overridabilityFromMethod(method));
+        const signature = `${typeVarDeclarations(types)}${displayStatic(returnType)} ${methodName}(${this.renderParameters(method.parameters, types, covariance)})`;
         this.code.line();
         this.addJavaDocs(method, {
             api: 'member',
@@ -1138,7 +1153,7 @@ class JavaGenerator extends generator_1.Generator {
         }
         else {
             this.code.openBlock(`${modifiers.join(' ')} ${signature}`);
-            this.emitUnionParameterValidation(method.parameters);
+            this.emitUnionParameterValidation(method.parameters, covariance);
             this.code.line(this.renderMethodCall(cls, method, async));
             this.code.closeBlock();
         }
@@ -1148,7 +1163,7 @@ class JavaGenerator extends generator_1.Generator {
      *
      * @param parameters the list of parameters received by the function.
      */
-    emitUnionParameterValidation(parameters) {
+    emitUnionParameterValidation(parameters, covariance) {
         if (!this.runtimeTypeChecking) {
             // We were configured not to emit those, so bail out now.
             return;
@@ -1162,7 +1177,7 @@ class JavaGenerator extends generator_1.Generator {
             if (param.variadic) {
                 const javaType = this.toSingleJavaType(param.type);
                 const asListName = `__${param.name}__asList`;
-                this.code.line(`final java.util.List<${displayStatic(javaType)}> ${asListName} = java.util.Arrays.asList(${param.name});`);
+                this.code.line(`final java.util.List<${displayStatic(javaType, covariance)}> ${asListName} = java.util.Arrays.asList(${param.name});`);
                 validate.call(this, asListName, `.append("${param.name}")`, {
                     collection: {
                         kind: spec.CollectionKind.Array,
@@ -1171,7 +1186,7 @@ class JavaGenerator extends generator_1.Generator {
                 }, param.name, true);
             }
             else {
-                validate.call(this, param.name, `.append("${param.name}")`, param.type, param.name);
+                validate.call(this, param.name, `.append("${param.name}")`, param.type, param.name, false);
             }
         }
         this.code.closeBlock();
@@ -1190,7 +1205,7 @@ class JavaGenerator extends generator_1.Generator {
                 }
             }
         }
-        function validateArray(value, descr, elementType, parameterName, isRawArray = false) {
+        function validateArray(value, descr, elementType, parameterName, isRawArray) {
             const suffix = (0, crypto_1.createHash)('sha256')
                 .update(descr)
                 .digest('hex')
@@ -1202,7 +1217,7 @@ class JavaGenerator extends generator_1.Generator {
             this.code.line(`final ${displayStatic(eltType)} ${valName} = ${value}.get(${idxName});`);
             validate.call(this, valName, isRawArray
                 ? `${descr}.append("[").append(${idxName}).append("]")`
-                : `${descr}.append(".get(").append(${idxName}).append(")")`, elementType, parameterName);
+                : `${descr}.append(".get(").append(${idxName}).append(")")`, elementType, parameterName, false);
             this.code.closeBlock();
         }
         function validateMap(value, descr, elementType, parameterName) {
@@ -1225,8 +1240,12 @@ class JavaGenerator extends generator_1.Generator {
             const varName = `__item_${suffix}`;
             const valName = `__val_${suffix}`;
             const javaElemType = this.toSingleJavaType(elementType);
-            this.code.openBlock(`for (final java.util.Map.Entry<String, ${displayStatic(javaElemType)}> ${varName}: ${value}.entrySet())`);
-            this.code.line(`final ${displayStatic(javaElemType)} ${valName} = ${varName}.getValue();`);
+            const entryType = mkStatic('java.util.Map.Entry', [
+                mkStatic('java.lang.String'),
+                javaElemType,
+            ]);
+            this.code.openBlock(`for (final ${displayStatic(entryType, covariance)} ${varName}: ${value}.entrySet())`);
+            this.code.line(`final ${displayStatic(javaElemType, covariance)} ${valName} = ${varName}.getValue();`);
             validate.call(this, valName, `${descr}.append(".get(\\"").append((${varName}.getKey())).append("\\")")`, elementType, parameterName);
             this.code.closeBlock();
         }
@@ -2161,15 +2180,11 @@ class JavaGenerator extends generator_1.Generator {
             return forceSingleType(this.toDecoratedJavaTypes(p));
         });
     }
-    renderParameters(parameters, types, overridable) {
+    renderParameters(parameters, types, cov) {
         parameters = parameters ?? [];
         if (parameters.length !== types.length) {
             throw new Error(`Arrays not same length: ${parameters.length} !== ${types.length}`);
         }
-        // We can render covariant parameters only for methods that aren't overridable... so only for static methods currently.
-        // (There are some more places where we could do this, like properties and constructors, but historically we didn't
-        // and I don't want to mess with this too much because the risk/reward isn't there.)
-        const cov = overridable === 'final' ? 'covariant' : undefined;
         const params = [];
         for (const [p, type] of (0, util_1.zip)(parameters, types)) {
             params.push(`final ${displayType(type, cov)}${p.variadic ? '...' : ''} ${JavaGenerator.safeJavaPropertyName(p.name)}`);
@@ -2859,6 +2874,7 @@ async function resolveMavenVersions(directory) {
     const versionsPluginVersion = '2.20.1';
     await (0, util_1.subprocess)('mvn', [
         `org.codehaus.mojo:versions-maven-plugin:${versionsPluginVersion}:resolve-ranges`,
+        '--settings=user.xml',
     ], {
         cwd: directory,
         retry: { maxAttempts: 1 },
@@ -2894,4 +2910,16 @@ function needsDefaultImpl(x) {
         x.definingType.fqn === x.parentType.fqn) &&
         !isBuiltinMethod);
 }
+/**
+ * Return the appropriate covariance rendering for the overridability of a given method
+ */
+function covarianceFromOverridability(overridable) {
+    // We can render covariant parameters only for methods that aren't overridable... so only for static methods currently.
+    // (There are some more places where we could do this, like properties and constructors, but historically we didn't
+    // and I don't want to mess with this too much because the risk/reward isn't there.)
+    return overridable === 'final' ? 'covariant' : 'exact-types';
+}
+function overridabilityFromMethod(method) {
+    return method.static ? 'final' : 'overridable';
+}
 //# sourceMappingURL=java.js.map

package/lib/util.d.ts

@@ -131,6 +131,6 @@ export declare function setExtend<A>(xs: Set<A>, els: Iterable<A>): void;
 export declare function filterAsync<A>(xs: A[], pred: (x: A) => Promise<boolean>): Promise<A[]>;
 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 zip<A, B>(xs: readonly A[], ys: readonly B[]): Array<[A, B]>;
 export declare function setAdd<T>(setA: Set<T>, setB: Iterable<T>): void;
 //# sourceMappingURL=util.d.ts.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.122.0 (build d5d44e9)";
+export declare const VERSION_DESC = "1.124.0 (build 987897b)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2025-12-22T15:21:44Z by generate.sh
+// Generated at 2025-12-30T12:06:47Z 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.122.0';
+exports.VERSION = '1.124.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.122.0 (build d5d44e9)';
+exports.VERSION_DESC = '1.124.0 (build 987897b)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.122.0",
+  "version": "1.124.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.122.0",
-    "@jsii/spec": "1.122.0",
+    "@jsii/check-node": "1.124.0",
+    "@jsii/spec": "1.124.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.122.0",
+    "codemaker": "^1.124.0",
     "commonmark": "^0.31.2",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.122.0",
+    "jsii-reflect": "^1.124.0",
     "semver": "^7.7.2",
     "spdx-license-list": "^6.10.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.122.0",
-    "@jsii/go-runtime": "^1.122.0",
-    "@jsii/java-runtime": "^1.122.0",
-    "@scope/jsii-calc-lib": "^1.122.0",
+    "@jsii/dotnet-runtime": "^1.124.0",
+    "@jsii/go-runtime": "^1.124.0",
+    "@jsii/java-runtime": "^1.124.0",
+    "@scope/jsii-calc-lib": "^1.124.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.122.0",
+    "jsii-build-tools": "^1.124.0",
     "jsii-calc": "^3.20.120",
     "jsii-rosetta": "~5.9.10",
     "pyright": "^1.1.403"