@jsii/runtime 1.68.0 → 1.70.0

package/lib/host.js

@@ -46,7 +46,10 @@ class KernelHost {
             if ('complete' in completeReq &&
                 completeReq.complete.cbid === callback.cbid) {
                 if (completeReq.complete.err) {
-                    throw new kernel_1.JsiiFault(completeReq.complete.err);
+                    if (completeReq.complete.name === "@jsii/kernel.Fault" /* JsiiErrorType.JSII_FAULT */) {
+                        throw new kernel_1.JsiiFault(completeReq.complete.err);
+                    }
+                    throw new kernel_1.RuntimeError(completeReq.complete.err);
                 }
                 return completeReq.complete.result;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/runtime",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "description": "jsii runtime kernel process",
   "license": "Apache-2.0",
   "author": {
@@ -34,16 +34,16 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/kernel": "^1.68.0",
-    "@jsii/check-node": "1.68.0",
-    "@jsii/spec": "^1.68.0"
+    "@jsii/kernel": "^1.70.0",
+    "@jsii/check-node": "1.70.0",
+    "@jsii/spec": "^1.70.0"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.68.0",
-    "@scope/jsii-calc-lib": "^1.68.0",
-    "jsii-build-tools": "^1.68.0",
+    "@scope/jsii-calc-base": "^1.70.0",
+    "@scope/jsii-calc-lib": "^1.70.0",
+    "jsii-build-tools": "^1.70.0",
     "jsii-calc": "^3.20.120",
-    "source-map-loader": "^4.0.0",
+    "source-map-loader": "^4.0.1",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   }

package/webpack/bin/jsii-runtime.js

@@ -2624,51 +2624,91 @@ var __webpack_modules__ = {
     },
     6027: (module, __unused_webpack_exports, __webpack_require__) => {
         const internalRe = __webpack_require__(9541);
+        const constants = __webpack_require__(9041);
+        const SemVer = __webpack_require__(3013);
+        const identifiers = __webpack_require__(3650);
+        const parse = __webpack_require__(7507);
+        const valid = __webpack_require__(2555);
+        const clean = __webpack_require__(3470);
+        const inc = __webpack_require__(5210);
+        const diff = __webpack_require__(5209);
+        const major = __webpack_require__(5847);
+        const minor = __webpack_require__(1757);
+        const patch = __webpack_require__(8150);
+        const prerelease = __webpack_require__(8011);
+        const compare = __webpack_require__(2247);
+        const rcompare = __webpack_require__(9201);
+        const compareLoose = __webpack_require__(2310);
+        const compareBuild = __webpack_require__(6845);
+        const sort = __webpack_require__(1934);
+        const rsort = __webpack_require__(7391);
+        const gt = __webpack_require__(6077);
+        const lt = __webpack_require__(866);
+        const eq = __webpack_require__(8443);
+        const neq = __webpack_require__(1017);
+        const gte = __webpack_require__(4578);
+        const lte = __webpack_require__(698);
+        const cmp = __webpack_require__(1918);
+        const coerce = __webpack_require__(4115);
+        const Comparator = __webpack_require__(7706);
+        const Range = __webpack_require__(6833);
+        const satisfies = __webpack_require__(8915);
+        const toComparators = __webpack_require__(8378);
+        const maxSatisfying = __webpack_require__(1678);
+        const minSatisfying = __webpack_require__(1553);
+        const minVersion = __webpack_require__(2262);
+        const validRange = __webpack_require__(7396);
+        const outside = __webpack_require__(939);
+        const gtr = __webpack_require__(4933);
+        const ltr = __webpack_require__(7233);
+        const intersects = __webpack_require__(8842);
+        const simplifyRange = __webpack_require__(3018);
+        const subset = __webpack_require__(8563);
         module.exports = {
+            parse,
+            valid,
+            clean,
+            inc,
+            diff,
+            major,
+            minor,
+            patch,
+            prerelease,
+            compare,
+            rcompare,
+            compareLoose,
+            compareBuild,
+            sort,
+            rsort,
+            gt,
+            lt,
+            eq,
+            neq,
+            gte,
+            lte,
+            cmp,
+            coerce,
+            Comparator,
+            Range,
+            satisfies,
+            toComparators,
+            maxSatisfying,
+            minSatisfying,
+            minVersion,
+            validRange,
+            outside,
+            gtr,
+            ltr,
+            intersects,
+            simplifyRange,
+            subset,
+            SemVer,
             re: internalRe.re,
             src: internalRe.src,
             tokens: internalRe.t,
-            SEMVER_SPEC_VERSION: __webpack_require__(9041).SEMVER_SPEC_VERSION,
-            SemVer: __webpack_require__(3013),
-            compareIdentifiers: __webpack_require__(3650).compareIdentifiers,
-            rcompareIdentifiers: __webpack_require__(3650).rcompareIdentifiers,
-            parse: __webpack_require__(7507),
-            valid: __webpack_require__(2555),
-            clean: __webpack_require__(3470),
-            inc: __webpack_require__(5210),
-            diff: __webpack_require__(5209),
-            major: __webpack_require__(5847),
-            minor: __webpack_require__(1757),
-            patch: __webpack_require__(8150),
-            prerelease: __webpack_require__(8011),
-            compare: __webpack_require__(2247),
-            rcompare: __webpack_require__(9201),
-            compareLoose: __webpack_require__(2310),
-            compareBuild: __webpack_require__(6845),
-            sort: __webpack_require__(1934),
-            rsort: __webpack_require__(7391),
-            gt: __webpack_require__(6077),
-            lt: __webpack_require__(866),
-            eq: __webpack_require__(8443),
-            neq: __webpack_require__(1017),
-            gte: __webpack_require__(4578),
-            lte: __webpack_require__(698),
-            cmp: __webpack_require__(1918),
-            coerce: __webpack_require__(4115),
-            Comparator: __webpack_require__(7706),
-            Range: __webpack_require__(6833),
-            satisfies: __webpack_require__(8915),
-            toComparators: __webpack_require__(8378),
-            maxSatisfying: __webpack_require__(1678),
-            minSatisfying: __webpack_require__(1553),
-            minVersion: __webpack_require__(2262),
-            validRange: __webpack_require__(7396),
-            outside: __webpack_require__(939),
-            gtr: __webpack_require__(4933),
-            ltr: __webpack_require__(7233),
-            intersects: __webpack_require__(8842),
-            simplifyRange: __webpack_require__(3018),
-            subset: __webpack_require__(8563)
+            SEMVER_SPEC_VERSION: constants.SEMVER_SPEC_VERSION,
+            compareIdentifiers: identifiers.compareIdentifiers,
+            rcompareIdentifiers: identifiers.rcompareIdentifiers
         };
     },
     9041: module => {

package/webpack/lib/program.js

@@ -7099,14 +7099,12 @@ var __webpack_modules__ = {
         const spec = __webpack_require__(1804);
         const spec_1 = __webpack_require__(1804);
         const cp = __webpack_require__(2081);
-        const fs_1 = __webpack_require__(7147);
         const fs = __webpack_require__(9477);
         const module_1 = __webpack_require__(8188);
         const os = __webpack_require__(2037);
         const path = __webpack_require__(4822);
         const api = __webpack_require__(2816);
         const api_1 = __webpack_require__(2816);
-        const link_1 = __webpack_require__(8261);
         const objects_1 = __webpack_require__(2309);
         const onExit = __webpack_require__(6703);
         const wire = __webpack_require__(8614);
@@ -7163,19 +7161,13 @@ var __webpack_modules__ = {
                 }
                 const originalUmask = process.umask(18);
                 try {
-                    const {path: extractedTo, cache} = this._debugTime((() => tar.extract(req.tarball, {
+                    const {cache} = this._debugTime((() => tar.extract(req.tarball, packageDir, {
                         strict: true,
                         strip: 1,
                         unlink: true
                     }, req.name, req.version)), `tar.extract(${req.tarball}) => ${packageDir}`);
-                    fs.mkdirSync(path.dirname(packageDir), {
-                        recursive: true
-                    });
                     if (cache != null) {
                         this._debug(`Package cache enabled, extraction resulted in a cache ${cache}`);
-                        this._debugTime((() => (0, link_1.link)(extractedTo, packageDir)), `link(${extractedTo}, ${packageDir})`);
-                    } else {
-                        (0, fs_1.renameSync)(extractedTo, packageDir);
                     }
                 } finally {
                     process.umask(originalUmask);
@@ -7367,7 +7359,10 @@ var __webpack_modules__ = {
                     this._debug("promise result:", result);
                 } catch (e) {
                     this._debug("promise error:", e);
-                    throw new JsiiFault(e.message);
+                    if (e.name === "@jsii/kernel.Fault") {
+                        throw new JsiiFault(e.message);
+                    }
+                    throw new RuntimeError(e);
                 }
                 return {
                     result: this._fromSandbox(result, (_a = method.returns) !== null && _a !== void 0 ? _a : "void", `returned by async method ${method.name}`)
@@ -7395,7 +7390,7 @@ var __webpack_modules__ = {
             }
             complete(req) {
                 var _a;
-                const {cbid, err, result} = req;
+                const {cbid, err, result, name} = req;
                 this._debug("complete", cbid, err, result);
                 const cb = this.waiting.get(cbid);
                 if (!cb) {
@@ -7403,7 +7398,7 @@ var __webpack_modules__ = {
                 }
                 if (err) {
                     this._debug("completed with error:", err);
-                    cb.fail(new Error(err));
+                    cb.fail(name === "@jsii/kernel.Fault" ? new JsiiFault(err) : new RuntimeError(err));
                 } else {
                     const sandoxResult = this._toSandbox(result, (_a = cb.expectedReturnType) !== null && _a !== void 0 ? _a : "void", `returned by callback ${cb.toString()}`);
                     this._debug("completed with result:", sandoxResult);
@@ -8883,36 +8878,44 @@ var __webpack_modules__ = {
         });
         exports.setPackageCacheEnabled = exports.getPackageCacheEnabled = exports.extract = void 0;
         const fs_1 = __webpack_require__(7147);
-        const os_1 = __webpack_require__(2037);
-        const path_1 = __webpack_require__(4822);
         const tar = __webpack_require__(1189);
         const disk_cache_1 = __webpack_require__(7202);
+        const link_1 = __webpack_require__(8261);
         const default_cache_root_1 = __webpack_require__(1034);
         let packageCacheEnabled = ((_a = process.env.JSII_RUNTIME_PACKAGE_CACHE) === null || _a === void 0 ? void 0 : _a.toLocaleUpperCase()) === "enabled";
-        function extract(file, options, ...comments) {
-            return (packageCacheEnabled ? extractToCache : extractToTemporary)(file, options, ...comments);
+        function extract(file, outDir, options, ...comments) {
+            (0, fs_1.mkdirSync)(outDir, {
+                recursive: true
+            });
+            try {
+                return (packageCacheEnabled ? extractViaCache : extractToOutDir)(file, outDir, options, ...comments);
+            } catch (err) {
+                (0, fs_1.rmSync)(outDir, {
+                    force: true,
+                    recursive: true
+                });
+                throw err;
+            }
         }
         exports.extract = extract;
-        function extractToCache(file, options = {}, ...comments) {
+        function extractViaCache(file, outDir, options = {}, ...comments) {
             var _a;
             const cacheRoot = (_a = process.env.JSII_RUNTIME_PACKAGE_CACHE_ROOT) !== null && _a !== void 0 ? _a : (0, 
             default_cache_root_1.defaultCacheRoot)();
-            const cache = disk_cache_1.DiskCache.inDirectory(cacheRoot);
-            const entry = cache.entryFor(file, ...comments);
-            return entry.lock((lock => {
+            const dirCache = disk_cache_1.DiskCache.inDirectory(cacheRoot);
+            const entry = dirCache.entryFor(file, ...comments);
+            const {path, cache} = entry.lock((lock => {
                 let cache = "hit";
                 if (!entry.pathExists) {
-                    const tmpPath = `${entry.path}.tmp`;
-                    (0, fs_1.mkdirSync)(tmpPath, {
+                    (0, fs_1.mkdirSync)(entry.path, {
                         recursive: true
                     });
                     try {
                         untarInto({
                             ...options,
-                            cwd: tmpPath,
+                            cwd: entry.path,
                             file
                         });
-                        (0, fs_1.renameSync)(tmpPath, entry.path);
                     } catch (error) {
                         (0, fs_1.rmSync)(entry.path, {
                             force: true,
@@ -8928,17 +8931,18 @@ var __webpack_modules__ = {
                     cache
                 };
             }));
+            (0, link_1.link)(path, outDir);
+            return {
+                cache
+            };
         }
-        function extractToTemporary(file, options = {}) {
-            const path = (0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), "jsii-runtime-untar-"));
+        function extractToOutDir(file, cwd, options = {}) {
             untarInto({
                 ...options,
-                cwd: path,
+                cwd,
                 file
             });
-            return {
-                path
-            };
+            return {};
         }
         function untarInto(options) {
             try {
@@ -10446,7 +10450,10 @@ var __webpack_modules__ = {
                     const completeReq = req;
                     if ("complete" in completeReq && completeReq.complete.cbid === callback.cbid) {
                         if (completeReq.complete.err) {
-                            throw new kernel_1.JsiiFault(completeReq.complete.err);
+                            if (completeReq.complete.name === "@jsii/kernel.Fault") {
+                                throw new kernel_1.JsiiFault(completeReq.complete.err);
+                            }
+                            throw new kernel_1.RuntimeError(completeReq.complete.err);
                         }
                         return completeReq.complete.result;
                     }
@@ -10687,7 +10694,11 @@ var __webpack_modules__ = {
         exports.loadAssemblyFromPath = loadAssemblyFromPath;
         function loadAssemblyFromFile(pathToFile, validate = true) {
             const data = fs.readFileSync(pathToFile);
-            return loadAssemblyFromBuffer(data, (filename => fs.readFileSync(path.resolve(pathToFile, "..", filename))), validate);
+            try {
+                return loadAssemblyFromBuffer(data, (filename => fs.readFileSync(path.resolve(pathToFile, "..", filename))), validate);
+            } catch (e) {
+                throw new Error(`Error loading assembly from file ${pathToFile}:\n${e}`);
+            }
         }
         exports.loadAssemblyFromFile = loadAssemblyFromFile;
         function followRedirect(assemblyRedirect, readFile) {
@@ -10903,11 +10914,16 @@ var __webpack_modules__ = {
         }
         exports.isAssemblyRedirect = isAssemblyRedirect;
         function validateAssemblyRedirect(obj) {
-            const ajv = new ajv_1.default;
+            const ajv = new ajv_1.default({
+                allErrors: true
+            });
             const validate = ajv.compile(exports.assemblyRedirectSchema);
             validate(obj);
             if (validate.errors) {
-                throw new Error(`Invalid assembly redirect:\n${validate.errors.map((e => ` * ${e.message}`)).join("\n").toString()}`);
+                throw new Error(`Invalid assembly redirect:\n * ${ajv.errorsText(validate.errors, {
+                    separator: "\n * ",
+                    dataVar: "redirect"
+                })}`);
             }
             return obj;
         }
@@ -10922,11 +10938,20 @@ var __webpack_modules__ = {
         const ajv_1 = __webpack_require__(2785);
         exports.schema = __webpack_require__(9402);
         function validateAssembly(obj) {
-            const ajv = new ajv_1.default;
+            const ajv = new ajv_1.default({
+                allErrors: true
+            });
             const validate = ajv.compile(exports.schema);
             validate(obj);
             if (validate.errors) {
-                throw new Error(`Invalid assembly:\n${validate.errors.map((e => ` * ${e.message}`)).join("\n").toString()}`);
+                let descr = "";
+                if (typeof obj.name === "string" && obj.name !== "") {
+                    descr = typeof obj.version === "string" ? ` ${obj.name}@${obj.version}` : ` ${obj.name}`;
+                }
+                throw new Error(`Invalid assembly${descr}:\n * ${ajv.errorsText(validate.errors, {
+                    separator: "\n * ",
+                    dataVar: "assembly"
+                })}`);
             }
             return obj;
         }
@@ -16195,7 +16220,7 @@ var __webpack_modules__ = {
     },
     4147: module => {
         "use strict";
-        module.exports = JSON.parse('{"name":"@jsii/runtime","version":"1.68.0","description":"jsii runtime kernel process","license":"Apache-2.0","author":{"name":"Amazon Web Services","url":"https://aws.amazon.com"},"homepage":"https://github.com/aws/jsii","bugs":{"url":"https://github.com/aws/jsii/issues"},"repository":{"type":"git","url":"https://github.com/aws/jsii.git","directory":"packages/@jsii/runtime"},"engines":{"node":">= 14.6.0"},"main":"lib/index.js","types":"lib/index.d.ts","bin":{"jsii-runtime":"bin/jsii-runtime"},"scripts":{"build":"tsc --build && chmod +x bin/jsii-runtime && npx webpack-cli && npm run lint","watch":"tsc --build -w","lint":"eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=webpack.config.js","lint:fix":"yarn lint --fix","test":"jest","test:update":"jest -u","package":"package-js"},"dependencies":{"@jsii/kernel":"^1.68.0","@jsii/check-node":"1.68.0","@jsii/spec":"^1.68.0"},"devDependencies":{"@scope/jsii-calc-base":"^1.68.0","@scope/jsii-calc-lib":"^1.68.0","jsii-build-tools":"^1.68.0","jsii-calc":"^3.20.120","source-map-loader":"^4.0.0","webpack":"^5.74.0","webpack-cli":"^4.10.0"}}');
+        module.exports = JSON.parse('{"name":"@jsii/runtime","version":"1.70.0","description":"jsii runtime kernel process","license":"Apache-2.0","author":{"name":"Amazon Web Services","url":"https://aws.amazon.com"},"homepage":"https://github.com/aws/jsii","bugs":{"url":"https://github.com/aws/jsii/issues"},"repository":{"type":"git","url":"https://github.com/aws/jsii.git","directory":"packages/@jsii/runtime"},"engines":{"node":">= 14.6.0"},"main":"lib/index.js","types":"lib/index.d.ts","bin":{"jsii-runtime":"bin/jsii-runtime"},"scripts":{"build":"tsc --build && chmod +x bin/jsii-runtime && npx webpack-cli && npm run lint","watch":"tsc --build -w","lint":"eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=webpack.config.js","lint:fix":"yarn lint --fix","test":"jest","test:update":"jest -u","package":"package-js"},"dependencies":{"@jsii/kernel":"^1.70.0","@jsii/check-node":"1.70.0","@jsii/spec":"^1.70.0"},"devDependencies":{"@scope/jsii-calc-base":"^1.70.0","@scope/jsii-calc-lib":"^1.70.0","jsii-build-tools":"^1.70.0","jsii-calc":"^3.20.120","source-map-loader":"^4.0.1","webpack":"^5.74.0","webpack-cli":"^4.10.0"}}');
     },
     5277: module => {
         "use strict";