jsii-pacmak 1.110.0 → 1.112.0

package/lib/packaging.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsiiModule = exports.DEFAULT_PACK_COMMAND = void 0;
 const fs = require("fs-extra");
-const os = require("os");
 const path = require("path");
 const util_1 = require("./util");
 const logging = require("../lib/logging");
@@ -39,10 +38,13 @@ class JsiiModule {
             // Take only the last line of npm pack which should contain the
             // tarball name. otherwise, there can be a lot of extra noise there
             // from scripts that emit to STDOUT.
-            const lines = out.trim().split(os.EOL);
+            // Since we are interested in the text *after* the last newline, splitting on '\n' is correct
+            // both on Linux/Mac (EOL = '\n') and Windows (EOL = '\r\n'), and also for UNIX tools running
+            // on Windows (expected EOL = '\r\n', actual EOL = '\n').
+            const lines = out.trim().split('\n');
             const lastLine = lines[lines.length - 1].trim();
             if (!lastLine.endsWith('.tgz') && !lastLine.endsWith('.tar.gz')) {
-                throw new Error(`${packCommand} did not produce tarball from ${this.moduleDirectory} into ${tmpdir} (output was ${JSON.stringify(lines)})`);
+                throw new Error(`${packCommand} did not produce tarball from ${this.moduleDirectory} into ${tmpdir} (output was ${JSON.stringify(lines.map((l) => l.trimEnd()))})`);
             }
             return path.resolve(tmpdir, lastLine);
         });

package/lib/targets/dotnet/dotnetgenerator.d.ts

@@ -58,6 +58,7 @@ export declare class DotNetGenerator extends Generator {
     protected onEnumMember(enm: spec.EnumType, member: spec.EnumMember): void;
     private namespaceFor;
     private emitMethod;
+    private memberKeywords;
     /**
      * Emits type checks for values passed for type union parameters.
      *
@@ -117,7 +118,7 @@ export declare class DotNetGenerator extends Generator {
      */
     private emitProperty;
     /**
-     * Emits a constant property
+     * Emits a (static) constant property
      */
     private emitConstProperty;
     private renderAccessLevel;

package/lib/targets/dotnet/dotnetgenerator.js

@@ -387,37 +387,7 @@ class DotNetGenerator extends generator_1.Generator {
             ? this.typeresolver.toDotNetType(method.returns.type)
             : 'void';
         const staticKeyWord = method.static ? 'static ' : '';
-        let overrideKeyWord = '';
-        let virtualKeyWord = '';
-        let definedOnAncestor = false;
-        // In the case of the source being a class, we check if it is already defined on an ancestor
-        if (spec.isClassType(cls)) {
-            definedOnAncestor = this.isMemberDefinedOnAncestor(cls, method);
-        }
-        // The method is an override if it's defined on the ancestor, or if the parent is a class and we are generating a proxy or datatype class
-        let overrides = definedOnAncestor || (spec.isClassType(cls) && emitForProxyOrDatatype);
-        // We also inspect the jsii model to see if it overrides a class member.
-        if (method.overrides) {
-            const overrideType = this.findType(method.overrides);
-            if (spec.isClassType(overrideType)) {
-                // Overrides a class, needs overrides keyword
-                overrides = true;
-            }
-        }
-        if (overrides) {
-            // Add the override key word if the method is emitted for a proxy or data type or is defined on an ancestor. If
-            // the member is static, use the "new" keyword instead, to indicate we are intentionally hiding the ancestor
-            // declaration (as C# does not inherit statics, they can be hidden but not overridden). The "new" keyword is
-            // optional in this context, but helps clarify intention.
-            overrideKeyWord = method.static ? 'new ' : 'override ';
-        }
-        else if (!method.static &&
-            (method.abstract || !definedOnAncestor) &&
-            !emitForProxyOrDatatype) {
-            // Add the virtual key word if the method is abstract or not defined on an ancestor and we are NOT generating a proxy or datatype class
-            // Methods should always be virtual when possible
-            virtualKeyWord = 'virtual ';
-        }
+        const { overrideKeyword, virtualKeyword } = this.memberKeywords(cls, method, emitForProxyOrDatatype);
         const access = this.renderAccessLevel(method);
         const methodName = this.nameutils.convertMethodName(method.name);
         const isOptional = method.returns && method.returns.optional ? '?' : '';
@@ -429,16 +399,50 @@ class DotNetGenerator extends generator_1.Generator {
         });
         this.dotnetRuntimeGenerator.emitAttributesForMethod(cls, method /*, emitForProxyOrDatatype*/);
         if (method.abstract) {
-            this.code.line(`${access} ${overrideKeyWord}abstract ${signature};`);
+            this.code.line(`${access} ${overrideKeyword}abstract ${signature};`);
             this.code.line();
         }
         else {
-            this.code.openBlock(`${access} ${staticKeyWord}${overrideKeyWord}${virtualKeyWord}${signature}`);
+            this.code.openBlock(`${access} ${staticKeyWord}${overrideKeyword}${virtualKeyword}${signature}`);
             this.emitUnionParameterValdation(this.reflectAssembly.findType(cls.fqn).allMethods.find((m) => m.name === method.name).parameters);
             this.code.line(this.dotnetRuntimeGenerator.createInvokeMethodIdentifier(method, cls));
             this.code.closeBlock();
         }
     }
+    memberKeywords(currentClass, member, proxyOrDataType) {
+        if (!spec.isClassType(currentClass)) {
+            return { overrideKeyword: '', virtualKeyword: '' };
+        }
+        const implementedInBase = this.isMemberDefinedOnAncestor(currentClass, member);
+        if (implementedInBase || proxyOrDataType) {
+            // Override if the property is in a datatype or proxy class or declared in a parent class. If the member is
+            // static, use the "new" keyword instead, to indicate we are intentionally hiding the ancestor declaration (as
+            // C# does not inherit statics, they can be hidden but not overridden).The "new" keyword is optional in this
+            // context, but helps clarify intention.
+            return {
+                overrideKeyword: member.static ? 'new ' : 'override ',
+                virtualKeyword: '',
+            };
+        }
+        else if (member.abstract) {
+            // Abstract members get decorated as such
+            return {
+                overrideKeyword: '',
+                virtualKeyword: 'abstract ',
+            };
+        }
+        else if (!member.static && !implementedInBase) {
+            // Virtual if the prop is not static, and is not implemented in base member, this way we can later override it.
+            return {
+                overrideKeyword: '',
+                virtualKeyword: 'virtual ',
+            };
+        }
+        return {
+            overrideKeyword: '',
+            virtualKeyword: '',
+        };
+    }
     /**
      * Emits type checks for values passed for type union parameters.
      *
@@ -471,6 +475,15 @@ class DotNetGenerator extends generator_1.Generator {
                 return true;
             }
         }
+        // Check the `overrides` directive directly from the jsii assembly
+        if (member.overrides) {
+            const overrideType = this.findType(member.overrides);
+            if (spec.isClassType(overrideType)) {
+                // Overrides a class, needs overrides keyword
+                return true;
+            }
+        }
+        // Look for something that's named the same
         const base = cls.base;
         if (base) {
             const baseType = this.findType(base);
@@ -735,29 +748,8 @@ class DotNetGenerator extends generator_1.Generator {
             this.code.line('[JsiiOptional]');
         }
         this.dotnetRuntimeGenerator.emitAttributesForProperty(prop);
-        let isOverrideKeyWord = '';
-        let isVirtualKeyWord = '';
-        let isAbstractKeyword = '';
-        // If the prop parent is a class
-        if (spec.isClassType(cls)) {
-            const implementedInBase = this.isMemberDefinedOnAncestor(cls, prop);
-            if (implementedInBase || datatype || proxy) {
-                // Override if the property is in a datatype or proxy class or declared in a parent class. If the member is
-                // static, use the "new" keyword instead, to indicate we are intentionally hiding the ancestor declaration (as
-                // C# does not inherit statics, they can be hidden but not overridden).The "new" keyword is optional in this
-                // context, but helps clarify intention.
-                isOverrideKeyWord = prop.static ? 'new ' : 'override ';
-            }
-            else if (prop.abstract) {
-                // Abstract members get decorated as such
-                isAbstractKeyword = 'abstract ';
-            }
-            else if (!prop.static && !implementedInBase) {
-                // Virtual if the prop is not static, and is not implemented in base member, this way we can later override it.
-                isVirtualKeyWord = 'virtual ';
-            }
-        }
-        const statement = `${access} ${isAbstractKeyword}${isVirtualKeyWord}${staticKeyWord}${isOverrideKeyWord}${propTypeFQN}${isOptional} ${propName}`;
+        const { virtualKeyword, overrideKeyword } = this.memberKeywords(cls, prop, datatype || proxy);
+        const statement = `${access} ${virtualKeyword}${staticKeyWord}${overrideKeyword}${propTypeFQN}${isOptional} ${propName}`;
         this.code.openBlock(statement);
         // Emit getters
         if (backingFieldName != null) {
@@ -815,7 +807,7 @@ class DotNetGenerator extends generator_1.Generator {
         this.flagFirstMemberWritten(true);
     }
     /**
-     * Emits a constant property
+     * Emits a (static) constant property
      */
     emitConstProperty(cls, prop) {
         this.emitNewLineIfNecessary();
@@ -831,7 +823,10 @@ class DotNetGenerator extends generator_1.Generator {
         const access = this.renderAccessLevel(prop);
         const propName = this.nameutils.convertPropertyName(prop.name);
         const staticKeyword = prop.static ? 'static ' : '';
-        this.code.openBlock(`${access} ${staticKeyword}${propType}${isOptional} ${propName}`);
+        const { overrideKeyword } = this.memberKeywords(cls, prop, 
+        // Static properties are never on proxies or datatypes (because those come from TS interfaces)
+        false);
+        this.code.openBlock(`${access} ${staticKeyword}${overrideKeyword}${propType}${isOptional} ${propName}`);
         this.code.line('get;');
         this.code.closeBlock();
         const className = this.typeresolver.toNativeFqn(cls.fqn);

package/lib/targets/go/types/class.js

@@ -85,12 +85,10 @@ class GoClass extends go_type_1.GoType {
     get implements() {
         // Cannot compute in constructor, as dependencies may not have finished
         // resolving just yet.
-        if (this._implements === undefined) {
-            this._implements = this.type.interfaces
-                .map((iface) => this.pkg.root.findType(iface.fqn))
-                // Ensure consistent order, mostly cosmetic.
-                .sort((l, r) => l.fqn.localeCompare(r.fqn));
-        }
+        this._implements ?? (this._implements = this.type.interfaces
+            .map((iface) => this.pkg.root.findType(iface.fqn))
+            // Ensure consistent order, mostly cosmetic.
+            .sort((l, r) => l.fqn.localeCompare(r.fqn)));
         return this._implements;
     }
     get baseTypes() {

package/lib/targets/go/types/go-type-reference.js

@@ -86,9 +86,7 @@ class GoTypeRef {
         return this.reference.void;
     }
     get typeMap() {
-        if (!this._typeMap) {
-            this._typeMap = this.buildTypeMap(this);
-        }
+        this._typeMap ?? (this._typeMap = this.buildTypeMap(this));
         return this._typeMap;
     }
     /**

package/lib/targets/python.js

@@ -1705,9 +1705,7 @@ class PythonGenerator extends generator_1.Generator {
         if ((!docs || Object.keys(docs).length === 0) && !options.arguments) {
             return;
         }
-        if (!docs) {
-            docs = {};
-        }
+        docs ?? (docs = {});
         const lines = new Array();
         if (docs.summary) {
             lines.push((0, markdown_1.md2rst)((0, _utils_1.renderSummary)(docs)));

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.110.0 (build 336b265)";
+export declare const VERSION_DESC = "1.112.0 (build de1bc80)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2025-03-19T11:46:46Z by generate.sh
+// Generated at 2025-05-07T14:36:30Z 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.110.0';
+exports.VERSION = '1.112.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.110.0 (build 336b265)';
+exports.VERSION_DESC = '1.112.0 (build de1bc80)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.110.0",
+  "version": "1.112.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.110.0",
-    "@jsii/spec": "^1.110.0",
+    "@jsii/check-node": "1.112.0",
+    "@jsii/spec": "^1.112.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.110.0",
+    "codemaker": "^1.112.0",
     "commonmark": "^0.31.2",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.110.0",
+    "jsii-reflect": "^1.112.0",
     "semver": "^7.7.1",
-    "spdx-license-list": "^6.9.0",
+    "spdx-license-list": "^6.10.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.110.0",
-    "@jsii/go-runtime": "^1.110.0",
-    "@jsii/java-runtime": "^1.110.0",
-    "@scope/jsii-calc-lib": "^1.110.0",
+    "@jsii/dotnet-runtime": "^1.112.0",
+    "@jsii/go-runtime": "^1.112.0",
+    "@jsii/java-runtime": "^1.112.0",
+    "@scope/jsii-calc-lib": "^1.112.0",
     "@types/clone": "^2.1.4",
     "@types/commonmark": "^0.27.9",
     "@types/diff": "^5.2.3",
     "@types/fs-extra": "^9.0.13",
-    "@types/semver": "^7.5.8",
+    "@types/semver": "^7.7.0",
     "diff": "^5.2.0",
     "jsii": "^5.8.0",
-    "jsii-build-tools": "^1.110.0",
+    "jsii-build-tools": "^1.112.0",
     "jsii-calc": "^3.20.120",
     "jsii-rosetta": "~5.8.0",
-    "pyright": "^1.1.395"
+    "pyright": "^1.1.400"
   },
   "peerDependencies": {
     "jsii-rosetta": ">=5.5.0"