jsii-pacmak 1.78.0 → 1.79.0

package/bin/jsii-pacmak.js

@@ -6,6 +6,7 @@ const jsii_rosetta_1 = require("jsii-rosetta");
 const yargs = require("yargs");
 const lib_1 = require("../lib");
 const logging_1 = require("../lib/logging");
+const packaging_1 = require("../lib/packaging");
 const version_1 = require("../lib/version");
 (async function main() {
     const argv = await yargs
@@ -139,6 +140,12 @@ const version_1 = require("../lib/version");
         defaultDescription: 'A temporary directory is used.',
         default: undefined,
         hidden: true,
+    })
+        .option('pack-command', {
+        type: 'string',
+        desc: 'Configure a custom command to create package tarballs. Command must output the name of the tarball.',
+        default: packaging_1.DEFAULT_PACK_COMMAND,
+        hidden: true,
     })
         .option('validate-assemblies', {
         type: 'boolean',

package/generate.sh

@@ -14,10 +14,10 @@ VERSION=$(node -p "require('./package.json').version.replace(/\\+[0-9a-f]+\$/, '
 cat > lib/version.ts <<HERE
 // Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh
 
-/** The short version number for this JSII compiler (e.g: \`X.Y.Z\`) */
+/** The short version number for this jsii-pacmak release (e.g: \`X.Y.Z\`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
 export const VERSION: string = '${VERSION}';
 
-/** The qualified version number for this JSII compiler (e.g: \`X.Y.Z (build #######)\`) */
+/** The qualified version number for this jsii-pacmak release (e.g: \`X.Y.Z (build #######)\`) */
 export const VERSION_DESC = '${VERSION} (build ${commit:0:7}${suffix:-})';
 HERE

package/lib/index.js

@@ -46,7 +46,7 @@ async function pacmak({ argv = {}, clean = true, codeOnly = false, fingerprint =
     }
     await timers.recordAsync('npm pack', () => {
         logging.info('Packaging NPM bundles');
-        return Promise.all(modulesToPackageFlat.map((m) => m.npmPack()));
+        return Promise.all(modulesToPackageFlat.map((m) => m.npmPack(argv['pack-command'])));
     });
     await timers.recordAsync('load jsii', () => {
         logging.info('Loading jsii assemblies and translations');

package/lib/packaging.d.ts

@@ -1,4 +1,5 @@
 import type { Assembly, TypeSystem } from 'jsii-reflect';
+export declare const DEFAULT_PACK_COMMAND = "npm pack";
 export interface JsiiModuleOptions {
     /**
      * Name of the module
@@ -33,7 +34,7 @@ export declare class JsiiModule {
     /**
      * Prepare an NPM package from this source module
      */
-    npmPack(): Promise<void>;
+    npmPack(packCommand?: string): Promise<void>;
     get tarball(): string;
     load(system: TypeSystem, validate?: boolean): Promise<Assembly>;
     get assembly(): Assembly;

package/lib/packaging.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsiiModule = void 0;
+exports.JsiiModule = exports.DEFAULT_PACK_COMMAND = void 0;
+const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
 const logging = require("../lib/logging");
 const util_1 = require("./util");
+exports.DEFAULT_PACK_COMMAND = 'npm pack';
 class JsiiModule {
     constructor(options) {
         this.name = options.name;
@@ -16,22 +18,31 @@ class JsiiModule {
     /**
      * Prepare an NPM package from this source module
      */
-    async npmPack() {
+    async npmPack(packCommand = exports.DEFAULT_PACK_COMMAND) {
         this._tarball = await util_1.Scratch.make(async (tmpdir) => {
-            // Quoting (JSON-stringifying) the module directory in order to avoid
-            // problems if there are spaces or other special characters in the path.
-            const args = ['pack', JSON.stringify(this.moduleDirectory)];
-            if (logging.level >= logging.LEVEL_VERBOSE) {
-                args.push('--loglevel=verbose');
+            const args = [];
+            if (packCommand === exports.DEFAULT_PACK_COMMAND) {
+                // Quoting (JSON-stringifying) the module directory in order to avoid
+                // problems if there are spaces or other special characters in the path.
+                args.push(JSON.stringify(this.moduleDirectory));
+                if (logging.level >= logging.LEVEL_VERBOSE) {
+                    args.push('--loglevel=verbose');
+                }
             }
-            const out = await (0, util_1.shell)('npm', args, { cwd: tmpdir });
+            else {
+                // Ensure module is copied to tmpdir to ensure parallel execution does not content on generated tarballs
+                await fs.copy(this.moduleDirectory, tmpdir);
+            }
+            const out = await (0, util_1.shell)(packCommand, args, {
+                cwd: tmpdir,
+            });
             // 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);
             const lastLine = lines[lines.length - 1].trim();
             if (!lastLine.endsWith('.tgz') && !lastLine.endsWith('.tar.gz')) {
-                throw new Error(`npm pack 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)})`);
             }
             return path.resolve(tmpdir, lastLine);
         });

package/lib/targets/dotnet/filegenerator.js

@@ -5,6 +5,7 @@ const path = require("path");
 const xmlbuilder = require("xmlbuilder");
 const __1 = require("..");
 const logging = require("../../logging");
+const version_1 = require("../../version");
 const dotnet_1 = require("../dotnet");
 const version_utils_1 = require("../version-utils");
 const nameutils_1 = require("./nameutils");
@@ -96,12 +97,10 @@ class FileGenerator {
         const itemGroup1 = rootNode.ele('ItemGroup');
         const embeddedResource = itemGroup1.ele('EmbeddedResource');
         embeddedResource.att('Include', this.tarballFileName);
-        // Strip " (build abcdef)" from the jsii version
-        const jsiiVersion = assembly.jsiiVersion.replace(/ .*$/, '');
         const itemGroup2 = rootNode.ele('ItemGroup');
         const packageReference = itemGroup2.ele('PackageReference');
         packageReference.att('Include', 'Amazon.JSII.Runtime');
-        packageReference.att('Version', (0, version_utils_1.toNuGetVersionRange)(`^${jsiiVersion}`));
+        packageReference.att('Version', (0, version_utils_1.toNuGetVersionRange)(`^${version_1.VERSION}`));
         dependencies.forEach((value) => {
             if (value.partOfCompilation) {
                 const dependencyReference = itemGroup2.ele('ProjectReference');

package/lib/targets/python.js

@@ -25,6 +25,7 @@ const logging_1 = require("../logging");
 const markdown_1 = require("../markdown");
 const target_1 = require("../target");
 const util_1 = require("../util");
+const version_1 = require("../version");
 const _utils_1 = require("./_utils");
 const type_name_1 = require("./python/type-name");
 const util_2 = require("./python/util");
@@ -1428,8 +1429,6 @@ class Package {
         code.line(this.rootModule?.moduleDocumentation ??
             `${this.name}\n${'='.repeat(this.name.length)}`);
         code.closeFile('README.md');
-        // Strip " (build abcdef)" from the jsii version
-        const jsiiVersionSimple = (0, version_utils_1.toReleaseVersion)(this.metadata.jsiiVersion.replace(/ .*$/, ''), index_1.TargetName.PYTHON);
         const setupKwargs = {
             name: this.name,
             version: this.version,
@@ -1452,7 +1451,7 @@ class Package {
             package_data: packageData,
             python_requires: '~=3.7',
             install_requires: [
-                `jsii${(0, version_utils_1.toPythonVersionRange)(`^${jsiiVersionSimple}`)}`,
+                `jsii${(0, version_utils_1.toPythonVersionRange)(`^${version_1.VERSION}`)}`,
                 'publication>=0.0.3',
                 'typeguard~=2.13.3',
             ]

package/lib/version.d.ts

@@ -1,5 +1,5 @@
-/** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
+/** 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 compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.78.0 (build 1041b18)";
+/** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
+export declare const VERSION_DESC = "1.79.0 (build b22f628)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2023-03-16T11:11:13Z by generate.sh
+// Generated at 2023-03-23T12:00:13Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
-/** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
+/** 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.78.0';
-/** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.78.0 (build 1041b18)';
+exports.VERSION = '1.79.0';
+/** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
+exports.VERSION_DESC = '1.79.0 (build b22f628)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.78.0",
+  "version": "1.79.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.78.0",
-    "@jsii/spec": "^1.78.0",
+    "@jsii/check-node": "1.79.0",
+    "@jsii/spec": "^1.79.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.78.0",
+    "codemaker": "^1.79.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.78.0",
-    "jsii-rosetta": "^1.78.0",
+    "jsii-reflect": "^1.79.0",
+    "jsii-rosetta": "^1.79.0",
     "semver": "^7.3.8",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.78.0",
-    "@jsii/java-runtime": "^1.78.0",
-    "@jsii/go-runtime": "^1.78.0",
-    "@scope/jsii-calc-lib": "^1.78.0",
+    "@jsii/dotnet-runtime": "^1.79.0",
+    "@jsii/java-runtime": "^1.79.0",
+    "@jsii/go-runtime": "^1.79.0",
+    "@scope/jsii-calc-lib": "^1.79.0",
     "@types/clone": "^2.1.1",
     "@types/diff": "^5.0.2",
     "@types/commonmark": "^0.27.5",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.3.13",
     "diff": "^5.1.0",
-    "jsii": "^1.78.0",
-    "jsii-build-tools": "^1.78.0",
+    "jsii": "^1.79.0",
+    "jsii-build-tools": "^1.79.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.296"
+    "pyright": "^1.1.300"
   },
   "keywords": [
     "jsii",