jsii-pacmak 1.113.0 → 1.115.0

package/lib/util.js

@@ -7,11 +7,13 @@ exports.findPackageJsonUp = findPackageJsonUp;
 exports.findUp = findUp;
 exports.retry = retry;
 exports.shell = shell;
+exports.subprocess = subprocess;
 exports.slugify = slugify;
 exports.setExtend = setExtend;
 exports.filterAsync = filterAsync;
 exports.wait = wait;
 exports.flatten = flatten;
+exports.zip = zip;
 const child_process_1 = require("child_process");
 const fs = require("fs-extra");
 const os = require("os");
@@ -134,25 +136,65 @@ async function retry(cb, opts = {}, waiter = wait) {
     return Promise.reject(new AllAttemptsFailed(cb, errors));
 }
 /**
- * Spawns a child process with the provided command and arguments. The child
- * process is always spawned using `shell: true`, and the contents of
+ * Spawns a shell with the provided commandline.
+ *
+ * The child process is always spawned using `shell: true`, and the contents of
  * `process.env` is used as the initial value of the `env` spawn option (values
  * provided in `options.env` can override those).
+ */
+async function shell(commandLine, options) {
+    return handleSubprocess(options, () => {
+        logging.debug(commandLine, JSON.stringify(options));
+        return {
+            command: commandLine,
+            child: (0, child_process_1.spawn)(commandLine, {
+                ...options,
+                shell: true,
+                env: { ...process.env, ...(options?.env ?? {}) },
+                stdio: ['ignore', 'pipe', 'pipe'],
+            }),
+        };
+    });
+}
+/**
+ * Spawns a subprocess with the provided command and arguments.
  *
- * @param cmd     the command to shell out to.
+ * The child process is always spawned using `shell: false`, and the contents of
+ * `process.env` is used as the initial value of the `env` spawn option (values
+ * provided in `options.env` can override those).
+ *
+ * To make this work on Windows, if the binary happens to resolve to a batch file
+ * we run it through cmd.exe.
+ *
+ * @param binary     the command to shell out to.
  * @param args    the arguments to provide to `cmd`
  * @param options any options to pass to `spawn`
  */
-async function shell(cmd, args, { retry: retryOptions, ...options } = {}) {
-    async function spawn1() {
-        logging.debug(cmd, args.join(' '), JSON.stringify(options));
-        return new Promise((ok, ko) => {
-            const child = (0, child_process_1.spawn)(cmd, args, {
+async function subprocess(binary, args, options) {
+    if (os.platform() === 'win32') {
+        const resolved = resolveBinaryWindows(binary);
+        // Anything that's not an executable, run it through cmd.exe
+        if (!resolved.toLocaleLowerCase().endsWith('.exe')) {
+            binary = process.env.COMSPEC ?? 'cmd.exe';
+            args = ['/d', '/c', resolved, ...args];
+        }
+    }
+    return handleSubprocess(options, () => {
+        logging.debug(binary, args.join(' '), JSON.stringify(options ?? {}));
+        return {
+            command: `${binary} ${args.join(' ')}`.trim(),
+            child: (0, child_process_1.spawn)(binary, args, {
                 ...options,
-                shell: true,
-                env: { ...process.env, ...(options.env ?? {}) },
+                env: { ...process.env, ...(options?.env ?? {}) },
                 stdio: ['ignore', 'pipe', 'pipe'],
-            });
+            }),
+        };
+    });
+}
+async function handleSubprocess({ retry: retryOptions } = {}, doSpawn) {
+    async function spawn1() {
+        return new Promise((ok, ko) => {
+            const { command, child } = doSpawn();
             const stdout = new Array();
             const stderr = new Array();
             child.stdout.on('data', (chunk) => {
@@ -177,7 +219,6 @@ async function shell(cmd, args, { retry: retryOptions, ...options } = {}) {
                 }
                 const err = Buffer.concat(stderr).toString('utf-8');
                 const reason = signal != null ? `signal ${signal}` : `status ${code}`;
-                const command = `${cmd} ${args.join(' ')}`;
                 return ko(new Error([
                     `Command (${command}) failed with ${reason}:`,
                     // STDERR first, the erro message could be truncated in logs.
@@ -202,12 +243,31 @@ async function shell(cmd, args, { retry: retryOptions, ...options } = {}) {
                     const retryInfo = attemptsLeft > 0
                         ? `Waiting ${backoffMs} ms before retrying (${attemptsLeft} attempts left)`
                         : 'No attempts left';
-                    logging.info(`Command "${cmd} ${args.join(' ')}" failed with ${message}. ${retryInfo}.`);
+                    logging.info(`${message}. ${retryInfo}.`);
                 }),
         });
     }
     return spawn1();
 }
+/**
+ * Resolve a command to an executable on Windows
+ */
+function resolveBinaryWindows(command) {
+    const extensions = (process.env.PATHEXT ?? '.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH').split(';');
+    const dirs = [
+        process.cwd(),
+        ...(process.env.PATH?.split(path.delimiter) ?? []),
+    ];
+    for (const dir of dirs) {
+        for (const ext of ['', ...extensions]) {
+            const candidate = path.resolve(dir, `${command}${ext}`);
+            if (fs.pathExistsSync(candidate)) {
+                return candidate;
+            }
+        }
+    }
+    throw new Error(`Unable to resolve command: ${command} in ${process.env.PATH}`);
+}
 /**
  * Strip filesystem unsafe characters from a string
  */
@@ -274,4 +334,11 @@ async function wait(ms) {
 function flatten(xs) {
     return Array.prototype.concat.call([], ...xs);
 }
+function zip(xs, ys) {
+    const ret = new Array();
+    for (let i = 0; i < xs.length; i++) {
+        ret.push([xs[i], ys[i]]);
+    }
+    return ret;
+}
 //# 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.113.0 (build fc68b25)";
+export declare const VERSION_DESC = "1.115.0 (build 9c5134e)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2025-07-31T12:47:09Z by generate.sh
+// Generated at 2025-09-29T13:25:03Z 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.113.0';
+exports.VERSION = '1.115.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.113.0 (build fc68b25)';
+exports.VERSION_DESC = '1.115.0 (build 9c5134e)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.113.0",
+  "version": "1.115.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,38 +37,39 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.113.0",
-    "@jsii/spec": "^1.113.0",
+    "@jsii/check-node": "1.115.0",
+    "@jsii/spec": "1.115.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.113.0",
+    "codemaker": "^1.115.0",
     "commonmark": "^0.31.2",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.113.0",
+    "jsii-reflect": "^1.115.0",
     "semver": "^7.7.2",
     "spdx-license-list": "^6.10.0",
     "xmlbuilder": "^15.1.1",
-    "yargs": "^16.2.0"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.113.0",
-    "@jsii/go-runtime": "^1.113.0",
-    "@jsii/java-runtime": "^1.113.0",
-    "@scope/jsii-calc-lib": "^1.113.0",
+    "@jsii/dotnet-runtime": "^1.115.0",
+    "@jsii/go-runtime": "^1.115.0",
+    "@jsii/java-runtime": "^1.115.0",
+    "@scope/jsii-calc-lib": "^1.115.0",
     "@types/clone": "^2.1.4",
     "@types/commonmark": "^0.27.10",
     "@types/diff": "^5.2.3",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.7.0",
+    "@types/yargs": "^17.0.33",
     "diff": "^5.2.0",
-    "jsii": "^5.8.0",
-    "jsii-build-tools": "^1.113.0",
+    "jsii": "^5.9.6",
+    "jsii-build-tools": "^1.115.0",
     "jsii-calc": "^3.20.120",
-    "jsii-rosetta": "~5.8.0",
+    "jsii-rosetta": "~5.9.6",
     "pyright": "^1.1.403"
   },
   "peerDependencies": {
-    "jsii-rosetta": ">=5.5.0"
+    "jsii-rosetta": ">=5.7.0"
   },
   "keywords": [
     "jsii",