@jsii/runtime 1.84.0 → 1.86.0

package/bin/jsii-runtime.js

@@ -8,9 +8,14 @@ const path_1 = require("path");
 // Spawn another node process, with the following file descriptor setup:
 // - No STDIN will be provided
 // - STDOUT and STDERR will be intercepted, contents wrapped & forward to STDERR
-// - FD#3 is the communication pipe to read jsii API messages
-// - FD#4 is the communication pipe to write jsii API responses
-const child = (0, child_process_1.spawn)(process.execPath, [...process.execArgv, (0, path_1.resolve)(__dirname, '..', 'lib', 'program.js')], { stdio: ['ignore', 'pipe', 'pipe', 'pipe'] });
+// - FD#3 is the communication pipe to read & write jsii API messages
+const child = (0, child_process_1.spawn)(process.execPath, [
+    ...process.execArgv,
+    // Instruct the module loader to NOT resolve symbolic links, so we don't
+    // have to copy modules around all the time (which is expensive to do).
+    '--preserve-symlinks',
+    (0, path_1.resolve)(__dirname, '..', 'lib', 'program.js'),
+], { stdio: ['ignore', 'pipe', 'pipe', 'pipe'] });
 //#region Exit, error and signal forwarders
 child.once('end', (code, signal) => {
     var _a;

package/lib/host.d.ts

@@ -8,6 +8,7 @@ export declare class KernelHost {
         debug?: boolean;
         debugTiming?: boolean;
         noStack?: boolean;
+        validateAssemblies?: boolean;
     });
     run(): void;
     once(event: 'exit', listener: (code: number) => void): void;

package/lib/host.js

@@ -5,13 +5,14 @@ const kernel_1 = require("@jsii/kernel");
 const events_1 = require("events");
 class KernelHost {
     constructor(inout, opts = {}) {
-        var _a, _b;
+        var _a, _b, _c;
         this.inout = inout;
         this.opts = opts;
         this.kernel = new kernel_1.Kernel(this.callbackHandler.bind(this));
         this.eventEmitter = new events_1.EventEmitter();
         this.kernel.traceEnabled = (_a = opts.debug) !== null && _a !== void 0 ? _a : false;
         this.kernel.debugTimingEnabled = (_b = opts.debugTiming) !== null && _b !== void 0 ? _b : false;
+        this.kernel.validateAssemblies = (_c = opts.validateAssemblies) !== null && _c !== void 0 ? _c : false;
     }
     run() {
         var _a;
@@ -31,7 +32,7 @@ class KernelHost {
     }
     callbackHandler(callback) {
         // write a "callback" response, which is a special response that tells
-        // the client that there's synchonous callback it needs to invoke and
+        // the client that there's synchronous callback it needs to invoke and
         // bring back the result via a "complete" request.
         this.inout.write({ callback });
         return completeCallback.call(this);

package/lib/program.js

@@ -10,6 +10,7 @@ const version = packageInfo.version;
 const noStack = !!process.env.JSII_NOSTACK;
 const debug = !!process.env.JSII_DEBUG;
 const debugTiming = !!process.env.JSII_DEBUG_TIMING;
+const validateAssemblies = !!process.env.JSII_VALIDATE_ASSEMBLIES;
 // This assumes FD#3 is opened for reading and writing. This is normally
 // performed by`bin/jsii-runtime.js`, and we will not be verifying this once
 // again...Meaning that failure to have set this up correctly results in
@@ -24,7 +25,12 @@ const stdio = new sync_stdio_1.SyncStdio({
     writeFD: 3,
 });
 const inout = new in_out_1.InputOutput(stdio);
-const host = new host_1.KernelHost(inout, { debug, noStack, debugTiming });
+const host = new host_1.KernelHost(inout, {
+    debug,
+    noStack,
+    debugTiming,
+    validateAssemblies,
+});
 host.once('exit', process.exit.bind(process));
 // say hello
 inout.write({ hello: `${name}@${version}` });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/runtime",
-  "version": "1.84.0",
+  "version": "1.86.0",
   "description": "jsii runtime kernel process",
   "license": "Apache-2.0",
   "author": {
@@ -34,17 +34,17 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/kernel": "^1.84.0",
-    "@jsii/check-node": "1.84.0",
-    "@jsii/spec": "^1.84.0"
+    "@jsii/kernel": "^1.86.0",
+    "@jsii/check-node": "1.86.0",
+    "@jsii/spec": "^1.86.0"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.84.0",
-    "@scope/jsii-calc-lib": "^1.84.0",
-    "jsii-build-tools": "^1.84.0",
+    "@scope/jsii-calc-base": "^1.86.0",
+    "@scope/jsii-calc-lib": "^1.86.0",
+    "jsii-build-tools": "^1.86.0",
     "jsii-calc": "^3.20.120",
     "source-map-loader": "^4.0.1",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4"
   }
 }

package/webpack/bin/jsii-runtime.js

@@ -1463,6 +1463,7 @@ var __webpack_modules__ = {
                         comp = comp.value;
                     }
                 }
+                comp = comp.trim().split(/\s+/).join(" ");
                 debug("comparator", comp, options);
                 this.options = options;
                 this.loose = !!options.loose;
@@ -1549,7 +1550,7 @@ var __webpack_modules__ = {
         }
         module.exports = Comparator;
         const parseOptions = __webpack_require__(3867);
-        const {re, t} = __webpack_require__(9541);
+        const {safeRe: re, t} = __webpack_require__(9541);
         const cmp = __webpack_require__(1918);
         const debug = __webpack_require__(5432);
         const SemVer = __webpack_require__(3013);
@@ -1575,10 +1576,10 @@ var __webpack_modules__ = {
                 this.options = options;
                 this.loose = !!options.loose;
                 this.includePrerelease = !!options.includePrerelease;
-                this.raw = range;
-                this.set = range.split("||").map((r => this.parseRange(r.trim()))).filter((c => c.length));
+                this.raw = range.trim().split(/\s+/).join(" ");
+                this.set = this.raw.split("||").map((r => this.parseRange(r.trim()))).filter((c => c.length));
                 if (!this.set.length) {
-                    throw new TypeError(`Invalid SemVer Range: ${range}`);
+                    throw new TypeError(`Invalid SemVer Range: ${this.raw}`);
                 }
                 if (this.set.length > 1) {
                     const first = this.set[0];
@@ -1604,7 +1605,6 @@ var __webpack_modules__ = {
                 return this.range;
             }
             parseRange(range) {
-                range = range.trim();
                 const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
                 const memoKey = memoOpts + ":" + range;
                 const cached = cache.get(memoKey);
@@ -1618,8 +1618,9 @@ var __webpack_modules__ = {
                 range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace);
                 debug("comparator trim", range);
                 range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
+                debug("tilde trim", range);
                 range = range.replace(re[t.CARETTRIM], caretTrimReplace);
-                range = range.split(/\s+/).join(" ");
+                debug("caret trim", range);
                 let rangeList = range.split(" ").map((comp => parseComparator(comp, this.options))).join(" ").split(/\s+/).map((comp => replaceGTE0(comp, this.options)));
                 if (loose) {
                     rangeList = rangeList.filter((comp => {
@@ -1677,7 +1678,7 @@ var __webpack_modules__ = {
         const Comparator = __webpack_require__(7706);
         const debug = __webpack_require__(5432);
         const SemVer = __webpack_require__(3013);
-        const {re, t, comparatorTrimReplace, tildeTrimReplace, caretTrimReplace} = __webpack_require__(9541);
+        const {safeRe: re, t, comparatorTrimReplace, tildeTrimReplace, caretTrimReplace} = __webpack_require__(9541);
         const {FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE} = __webpack_require__(9041);
         const isNullSet = c => c.value === "<0.0.0-0";
         const isAny = c => c.value === "";
@@ -1892,7 +1893,7 @@ var __webpack_modules__ = {
     3013: (module, __unused_webpack_exports, __webpack_require__) => {
         const debug = __webpack_require__(5432);
         const {MAX_LENGTH, MAX_SAFE_INTEGER} = __webpack_require__(9041);
-        const {re, t} = __webpack_require__(9541);
+        const {safeRe: re, t} = __webpack_require__(9541);
         const parseOptions = __webpack_require__(3867);
         const {compareIdentifiers} = __webpack_require__(3650);
         class SemVer {
@@ -2123,8 +2124,10 @@ var __webpack_modules__ = {
                   default:
                     throw new Error(`invalid increment argument: ${release}`);
                 }
-                this.format();
-                this.raw = this.version;
+                this.raw = this.format();
+                if (this.build.length) {
+                    this.raw += `+${this.build.join(".")}`;
+                }
                 return this;
             }
         }
@@ -2194,7 +2197,7 @@ var __webpack_modules__ = {
     4115: (module, __unused_webpack_exports, __webpack_require__) => {
         const SemVer = __webpack_require__(3013);
         const parse = __webpack_require__(7507);
-        const {re, t} = __webpack_require__(9541);
+        const {safeRe: re, t} = __webpack_require__(9541);
         const coerce = (version, options) => {
             if (version instanceof SemVer) {
                 return version;
@@ -2258,6 +2261,19 @@ var __webpack_modules__ = {
             const highVersion = v1Higher ? v1 : v2;
             const lowVersion = v1Higher ? v2 : v1;
             const highHasPre = !!highVersion.prerelease.length;
+            const lowHasPre = !!lowVersion.prerelease.length;
+            if (lowHasPre && !highHasPre) {
+                if (!lowVersion.patch && !lowVersion.minor) {
+                    return "major";
+                }
+                if (highVersion.patch) {
+                    return "patch";
+                }
+                if (highVersion.minor) {
+                    return "minor";
+                }
+                return "major";
+            }
             const prefix = highHasPre ? "pre" : "";
             if (v1.major !== v2.major) {
                 return prefix + "major";
@@ -2268,16 +2284,7 @@ var __webpack_modules__ = {
             if (v1.patch !== v2.patch) {
                 return prefix + "patch";
             }
-            if (highHasPre) {
-                return "prerelease";
-            }
-            if (lowVersion.patch) {
-                return "patch";
-            }
-            if (lowVersion.minor) {
-                return "minor";
-            }
-            return "major";
+            return "prerelease";
         };
         module.exports = diff;
     },
@@ -2497,10 +2504,12 @@ var __webpack_modules__ = {
         const MAX_LENGTH = 256;
         const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
         const MAX_SAFE_COMPONENT_LENGTH = 16;
+        const MAX_SAFE_BUILD_LENGTH = MAX_LENGTH - 6;
         const RELEASE_TYPES = [ "major", "premajor", "minor", "preminor", "patch", "prepatch", "prerelease" ];
         module.exports = {
             MAX_LENGTH,
             MAX_SAFE_COMPONENT_LENGTH,
+            MAX_SAFE_BUILD_LENGTH,
             MAX_SAFE_INTEGER,
             RELEASE_TYPES,
             SEMVER_SPEC_VERSION,
@@ -2546,30 +2555,41 @@ var __webpack_modules__ = {
         module.exports = parseOptions;
     },
     9541: (module, exports, __webpack_require__) => {
-        const {MAX_SAFE_COMPONENT_LENGTH} = __webpack_require__(9041);
+        const {MAX_SAFE_COMPONENT_LENGTH, MAX_SAFE_BUILD_LENGTH, MAX_LENGTH} = __webpack_require__(9041);
         const debug = __webpack_require__(5432);
         exports = module.exports = {};
         const re = exports.re = [];
+        const safeRe = exports.safeRe = [];
         const src = exports.src = [];
         const t = exports.t = {};
         let R = 0;
+        const LETTERDASHNUMBER = "[a-zA-Z0-9-]";
+        const safeRegexReplacements = [ [ "\\s", 1 ], [ "\\d", MAX_LENGTH ], [ LETTERDASHNUMBER, MAX_SAFE_BUILD_LENGTH ] ];
+        const makeSafeRegex = value => {
+            for (const [token, max] of safeRegexReplacements) {
+                value = value.split(`${token}*`).join(`${token}{0,${max}}`).split(`${token}+`).join(`${token}{1,${max}}`);
+            }
+            return value;
+        };
         const createToken = (name, value, isGlobal) => {
+            const safe = makeSafeRegex(value);
             const index = R++;
             debug(name, index, value);
             t[name] = index;
             src[index] = value;
             re[index] = new RegExp(value, isGlobal ? "g" : undefined);
+            safeRe[index] = new RegExp(safe, isGlobal ? "g" : undefined);
         };
         createToken("NUMERICIDENTIFIER", "0|[1-9]\\d*");
-        createToken("NUMERICIDENTIFIERLOOSE", "[0-9]+");
-        createToken("NONNUMERICIDENTIFIER", "\\d*[a-zA-Z-][a-zA-Z0-9-]*");
+        createToken("NUMERICIDENTIFIERLOOSE", "\\d+");
+        createToken("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${LETTERDASHNUMBER}*`);
         createToken("MAINVERSION", `(${src[t.NUMERICIDENTIFIER]})\\.` + `(${src[t.NUMERICIDENTIFIER]})\\.` + `(${src[t.NUMERICIDENTIFIER]})`);
         createToken("MAINVERSIONLOOSE", `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` + `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` + `(${src[t.NUMERICIDENTIFIERLOOSE]})`);
         createToken("PRERELEASEIDENTIFIER", `(?:${src[t.NUMERICIDENTIFIER]}|${src[t.NONNUMERICIDENTIFIER]})`);
         createToken("PRERELEASEIDENTIFIERLOOSE", `(?:${src[t.NUMERICIDENTIFIERLOOSE]}|${src[t.NONNUMERICIDENTIFIER]})`);
         createToken("PRERELEASE", `(?:-(${src[t.PRERELEASEIDENTIFIER]}(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`);
         createToken("PRERELEASELOOSE", `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`);
-        createToken("BUILDIDENTIFIER", "[0-9A-Za-z-]+");
+        createToken("BUILDIDENTIFIER", `${LETTERDASHNUMBER}+`);
         createToken("BUILD", `(?:\\+(${src[t.BUILDIDENTIFIER]}(?:\\.${src[t.BUILDIDENTIFIER]})*))`);
         createToken("FULLPLAIN", `v?${src[t.MAINVERSION]}${src[t.PRERELEASE]}?${src[t.BUILD]}?`);
         createToken("FULL", `^${src[t.FULLPLAIN]}$`);
@@ -3928,7 +3948,7 @@ var __webpack_exports__ = {};
     const console_1 = __webpack_require__(6206);
     const os_1 = __webpack_require__(2037);
     const path_1 = __webpack_require__(4822);
-    const child = (0, child_process_1.spawn)(process.execPath, [ ...process.execArgv, (0, 
+    const child = (0, child_process_1.spawn)(process.execPath, [ ...process.execArgv, "--preserve-symlinks", (0, 
     path_1.resolve)(__dirname, "..", "lib", "program.js") ], {
         stdio: [ "ignore", "pipe", "pipe", "pipe" ]
     });