@jsii/kernel 1.67.0 → 1.69.0

package/lib/kernel.d.ts

@@ -1,4 +1,19 @@
 import * as api from './api';
+export declare const enum JsiiErrorType {
+    JSII_FAULT = "@jsii/kernel.Fault",
+    RUNTIME_ERROR = "@jsii/kernel.RuntimeError"
+}
+export interface JsiiError extends Error {
+    readonly name: JsiiErrorType;
+}
+export declare class JsiiFault extends Error implements JsiiError {
+    readonly name = JsiiErrorType.JSII_FAULT;
+    constructor(message: string);
+}
+export declare class RuntimeError extends Error implements JsiiError {
+    readonly name = JsiiErrorType.RUNTIME_ERROR;
+    constructor(message: string);
+}
 export declare class Kernel {
     callbackHandler: (callback: api.Callback) => any;
     /**

package/lib/kernel.js

@@ -1,21 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Kernel = void 0;
+exports.Kernel = exports.RuntimeError = exports.JsiiFault = void 0;
 const spec = require("@jsii/spec");
 const spec_1 = require("@jsii/spec");
 const cp = require("child_process");
-const fs_1 = require("fs");
 const fs = require("fs-extra");
 const module_1 = require("module");
 const os = require("os");
 const path = require("path");
 const api = require("./api");
 const api_1 = require("./api");
-const link_1 = require("./link");
 const objects_1 = require("./objects");
 const onExit = require("./on-exit");
 const wire = require("./serialization");
 const tar = require("./tar-cache");
+class JsiiFault extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "@jsii/kernel.Fault" /* JsiiErrorType.JSII_FAULT */;
+    }
+}
+exports.JsiiFault = JsiiFault;
+class RuntimeError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "@jsii/kernel.RuntimeError" /* JsiiErrorType.RUNTIME_ERROR */;
+    }
+}
+exports.RuntimeError = RuntimeError;
 class Kernel {
     /**
      * Creates a jsii kernel object.
@@ -48,7 +60,7 @@ class Kernel {
         var _a, _b, _c;
         this._debug('load', req);
         if ('assembly' in req) {
-            throw new Error('`assembly` field is deprecated for "load", use `name`, `version` and `tarball` instead');
+            throw new JsiiFault('`assembly` field is deprecated for "load", use `name`, `version` and `tarball` instead');
         }
         const pkgname = req.name;
         const pkgver = req.version;
@@ -58,7 +70,7 @@ class Kernel {
             // module exists, verify version
             const epkg = fs.readJsonSync(path.join(packageDir, 'package.json'));
             if (epkg.version !== pkgver) {
-                throw new Error(`Multiple versions ${pkgver} and ${epkg.version} of the ` +
+                throw new JsiiFault(`Multiple versions ${pkgver} and ${epkg.version} of the ` +
                     `package '${pkgname}' cannot be loaded together since this is unsupported by ` +
                     'some runtime environments');
             }
@@ -74,21 +86,13 @@ class Kernel {
         const originalUmask = process.umask(0o022);
         try {
             // untar the archive to its final location
-            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}`);
-            // Create the install directory (there may be several path components for @scoped/packages)
-            fs.mkdirSync(path.dirname(packageDir), { recursive: true });
             if (cache != null) {
                 this._debug(`Package cache enabled, extraction resulted in a cache ${cache}`);
-                // Link the package into place.
-                this._debugTime(() => (0, link_1.link)(extractedTo, packageDir), `link(${extractedTo}, ${packageDir})`);
-            }
-            else {
-                // This is not from cache, so we move it around instead of copying.
-                (0, fs_1.renameSync)(extractedTo, packageDir);
             }
         }
         finally {
@@ -101,7 +105,7 @@ class Kernel {
             assmSpec = this._debugTime(() => (0, spec_1.loadAssemblyFromPath)(packageDir), `loadAssemblyFromPath(${packageDir})`);
         }
         catch (e) {
-            throw new Error(`Error for package tarball ${req.tarball}: ${e.message}`);
+            throw new JsiiFault(`Error for package tarball ${req.tarball}: ${e.message}`);
         }
         // load the module and capture its closure
         const closure = this._debugTime(() => this.require(packageDir), `require(${packageDir})`);
@@ -119,11 +123,11 @@ class Kernel {
             // module exists, verify version
             const epkg = fs.readJsonSync(path.join(packageDir, 'package.json'));
             if (!epkg.bin) {
-                throw new Error('There is no bin scripts defined for this package.');
+                throw new JsiiFault('There is no bin scripts defined for this package.');
             }
             const scriptPath = epkg.bin[req.script];
             if (!epkg.bin) {
-                throw new Error(`Script with name ${req.script} was not defined.`);
+                throw new JsiiFault(`Script with name ${req.script} was not defined.`);
             }
             const result = cp.spawnSync(path.join(packageDir, scriptPath), (_a = req.args) !== null && _a !== void 0 ? _a : [], {
                 encoding: 'utf-8',
@@ -143,7 +147,7 @@ class Kernel {
                 signal: result.signal,
             };
         }
-        throw new Error(`Package with name ${req.assembly} was not loaded.`);
+        throw new JsiiFault(`Package with name ${req.assembly} was not loaded.`);
     }
     create(req) {
         return this._create(req);
@@ -160,7 +164,7 @@ class Kernel {
         this._debug('sget', symbol);
         const ti = this._typeInfoForProperty(property, fqn);
         if (!ti.static) {
-            throw new Error(`property ${symbol} is not static`);
+            throw new JsiiFault(`property ${symbol} is not static`);
         }
         const prototype = this._findSymbol(fqn);
         const value = this._ensureSync(`property ${property}`, () => prototype[property]);
@@ -175,10 +179,10 @@ class Kernel {
         this._debug('sset', symbol);
         const ti = this._typeInfoForProperty(property, fqn);
         if (!ti.static) {
-            throw new Error(`property ${symbol} is not static`);
+            throw new JsiiFault(`property ${symbol} is not static`);
         }
         if (ti.immutable) {
-            throw new Error(`static property ${symbol} is readonly`);
+            throw new JsiiFault(`static property ${symbol} is readonly`);
         }
         const prototype = this._findSymbol(fqn);
         this._ensureSync(`property ${property}`, () => (prototype[property] = this._toSandbox(value, ti, `assigned to static property ${symbol}`)));
@@ -209,7 +213,7 @@ class Kernel {
         const { instance, fqn, interfaces } = this.objects.findObject(objref);
         const propInfo = this._typeInfoForProperty(req.property, fqn, interfaces);
         if (propInfo.immutable) {
-            throw new Error(`Cannot set value of immutable property ${req.property} to ${req.value}`);
+            throw new JsiiFault(`Cannot set value of immutable property ${req.property} to ${req.value}`);
         }
         const propertyToSet = this._findPropertyTarget(instance, property);
         this._ensureSync(`property '${objref[api_1.TOKEN_REF]}.${propertyToSet}'`, () => (instance[propertyToSet] = this._toSandbox(value, propInfo, `assigned to property ${fqn}.${property}`)));
@@ -223,7 +227,7 @@ class Kernel {
         const { ti, obj, fn } = this._findInvokeTarget(objref, method, args);
         // verify this is not an async method
         if (ti.async) {
-            throw new Error(`${method} is an async method, use "begin" instead`);
+            throw new JsiiFault(`${method} is an async method, use "begin" instead`);
         }
         const fqn = (0, objects_1.jsiiTypeFqn)(obj);
         const ret = this._ensureSync(`method '${objref[api_1.TOKEN_REF]}.${method}'`, () => {
@@ -240,11 +244,11 @@ class Kernel {
         this._debug('sinvoke', fqn, method, args);
         const ti = this._typeInfoForMethod(method, fqn);
         if (!ti.static) {
-            throw new Error(`${fqn}.${method} is not a static method`);
+            throw new JsiiFault(`${fqn}.${method} is not a static method`);
         }
         // verify this is not an async method
         if (ti.async) {
-            throw new Error(`${method} is an async method, use "begin" instead`);
+            throw new JsiiFault(`${method} is an async method, use "begin" instead`);
         }
         const prototype = this._findSymbol(fqn);
         const fn = prototype[method];
@@ -262,12 +266,12 @@ class Kernel {
         const args = (_a = req.args) !== null && _a !== void 0 ? _a : [];
         this._debug('begin', objref, method, args);
         if (this.syncInProgress) {
-            throw new Error(`Cannot invoke async method '${req.objref[api_1.TOKEN_REF]}.${req.method}' while sync ${this.syncInProgress} is being processed`);
+            throw new JsiiFault(`Cannot invoke async method '${req.objref[api_1.TOKEN_REF]}.${req.method}' while sync ${this.syncInProgress} is being processed`);
         }
         const { ti, obj, fn } = this._findInvokeTarget(objref, method, args);
         // verify this is indeed an async method
         if (!ti.async) {
-            throw new Error(`Method ${method} is expected to be an async method`);
+            throw new JsiiFault(`Method ${method} is expected to be an async method`);
         }
         const fqn = (0, objects_1.jsiiTypeFqn)(obj);
         const promise = fn.apply(obj, this._toSandboxValues(args, `async method ${fqn ? `${fqn}#` : ''}${method}`, ti.parameters));
@@ -288,7 +292,7 @@ class Kernel {
         this._debug('end', promiseid);
         const storedPromise = this.promises.get(promiseid);
         if (storedPromise == null) {
-            throw new Error(`Cannot find promise with ID: ${promiseid}`);
+            throw new JsiiFault(`Cannot find promise with ID: ${promiseid}`);
         }
         const { promise, method } = storedPromise;
         let result;
@@ -298,7 +302,7 @@ class Kernel {
         }
         catch (e) {
             this._debug('promise error:', e);
-            throw e;
+            throw new JsiiFault(e.message);
         }
         return {
             result: this._fromSandbox(result, (_a = method.returns) !== null && _a !== void 0 ? _a : 'void', `returned by async method ${method.name}`),
@@ -328,7 +332,7 @@ class Kernel {
         this._debug('complete', cbid, err, result);
         const cb = this.waiting.get(cbid);
         if (!cb) {
-            throw new Error(`Callback ${cbid} not found`);
+            throw new JsiiFault(`Callback ${cbid} not found`);
         }
         if (err) {
             this._debug('completed with error:', err);
@@ -352,7 +356,7 @@ class Kernel {
         const assembly = this._assemblyFor(assemblyName);
         const targets = assembly.metadata.targets;
         if (!targets) {
-            throw new Error(`Unexpected - "targets" for ${assemblyName} is missing!`);
+            throw new JsiiFault(`Unexpected - "targets" for ${assemblyName} is missing!`);
         }
         return { naming: targets };
     }
@@ -374,7 +378,7 @@ class Kernel {
                 case spec.TypeKind.Class:
                 case spec.TypeKind.Enum:
                     const constructor = this._findSymbol(fqn);
-                    (0, objects_1.tagJsiiConstructor)(constructor, fqn, assm.metadata.version);
+                    (0, objects_1.tagJsiiConstructor)(constructor, fqn);
             }
         }
     }
@@ -393,9 +397,9 @@ class Kernel {
                     parameters: classType.initializer && classType.initializer.parameters,
                 };
             case spec.TypeKind.Interface:
-                throw new Error(`Cannot create an object with an FQN of an interface: ${fqn}`);
+                throw new JsiiFault(`Cannot create an object with an FQN of an interface: ${fqn}`);
             default:
-                throw new Error(`Unexpected FQN kind: ${fqn}`);
+                throw new JsiiFault(`Unexpected FQN kind: ${fqn}`);
         }
     }
     _getPackageDir(pkgname) {
@@ -429,26 +433,26 @@ class Kernel {
             for (const override of overrides) {
                 if (api.isMethodOverride(override)) {
                     if (api.isPropertyOverride(override)) {
-                        throw new Error(overrideTypeErrorMessage);
+                        throw new JsiiFault(overrideTypeErrorMessage);
                     }
                     if (methods.has(override.method)) {
-                        throw new Error(`Duplicate override for method '${override.method}'`);
+                        throw new JsiiFault(`Duplicate override for method '${override.method}'`);
                     }
                     methods.add(override.method);
                     this._applyMethodOverride(obj, objref, fqn, interfaces, override);
                 }
                 else if (api.isPropertyOverride(override)) {
                     if (api.isMethodOverride(override)) {
-                        throw new Error(overrideTypeErrorMessage);
+                        throw new JsiiFault(overrideTypeErrorMessage);
                     }
                     if (properties.has(override.property)) {
-                        throw Error(`Duplicate override for property '${override.property}'`);
+                        throw new JsiiFault(`Duplicate override for property '${override.property}'`);
                     }
                     properties.add(override.property);
                     this._applyPropertyOverride(obj, objref, fqn, interfaces, override);
                 }
                 else {
-                    throw new Error(overrideTypeErrorMessage);
+                    throw new JsiiFault(overrideTypeErrorMessage);
                 }
             }
         }
@@ -460,7 +464,7 @@ class Kernel {
     _applyPropertyOverride(obj, objref, typeFqn, interfaces, override) {
         // error if we can find a method with this name
         if (this._tryTypeInfoForMethod(override.property, typeFqn, interfaces)) {
-            throw new Error(`Trying to override method '${override.property}' as a property`);
+            throw new JsiiFault(`Trying to override method '${override.property}' as a property`);
         }
         let propInfo = this._tryTypeInfoForProperty(override.property, typeFqn, interfaces);
         // if this is a private property (i.e. doesn't have `propInfo` the object has a key)
@@ -546,7 +550,7 @@ class Kernel {
     _applyMethodOverride(obj, objref, typeFqn, interfaces, override) {
         // error if we can find a property with this name
         if (this._tryTypeInfoForProperty(override.method, typeFqn, interfaces)) {
-            throw new Error(`Trying to override property '${override.method}' as a method`);
+            throw new JsiiFault(`Trying to override property '${override.method}' as a method`);
         }
         let methodInfo = this._tryTypeInfoForMethod(override.method, typeFqn, interfaces);
         // If this is a private method (doesn't have methodInfo, key resolves on the object), we
@@ -645,7 +649,7 @@ class Kernel {
         if (!fn) {
             fn = instance[methodName];
             if (!fn) {
-                throw new Error(`Cannot find ${methodName} on object`);
+                throw new JsiiFault(`Cannot find ${methodName} on object`);
             }
         }
         return { ti, obj: instance, fn };
@@ -655,7 +659,7 @@ class Kernel {
         const params = (_a = method === null || method === void 0 ? void 0 : method.parameters) !== null && _a !== void 0 ? _a : [];
         // error if args > params
         if (args.length > params.length && !(method && method.variadic)) {
-            throw new Error(`Too many arguments (method accepts ${params.length} parameters, got ${args.length} arguments)`);
+            throw new JsiiFault(`Too many arguments (method accepts ${params.length} parameters, got ${args.length} arguments)`);
         }
         for (let i = 0; i < params.length; ++i) {
             const param = params[i];
@@ -666,19 +670,19 @@ class Kernel {
                 } // No vararg was provided
                 for (let j = i; j < params.length; j++) {
                     if (!param.optional && params[j] === undefined) {
-                        throw new Error(`Unexpected 'undefined' value at index ${j - i} of variadic argument '${param.name}' of type '${spec.describeTypeReference(param.type)}'`);
+                        throw new JsiiFault(`Unexpected 'undefined' value at index ${j - i} of variadic argument '${param.name}' of type '${spec.describeTypeReference(param.type)}'`);
                     }
                 }
             }
             else if (!param.optional && arg === undefined) {
-                throw new Error(`Not enough arguments. Missing argument for the required parameter '${param.name}' of type '${spec.describeTypeReference(param.type)}'`);
+                throw new JsiiFault(`Not enough arguments. Missing argument for the required parameter '${param.name}' of type '${spec.describeTypeReference(param.type)}'`);
             }
         }
     }
     _assemblyFor(assemblyName) {
         const assembly = this.assemblies.get(assemblyName);
         if (!assembly) {
-            throw new Error(`Could not find assembly: ${assemblyName}`);
+            throw new JsiiFault(`Could not find assembly: ${assemblyName}`);
         }
         return assembly;
     }
@@ -694,7 +698,7 @@ class Kernel {
             curr = curr[name];
         }
         if (!curr) {
-            throw new Error(`Could not find symbol ${fqn}`);
+            throw new JsiiFault(`Could not find symbol ${fqn}`);
         }
         return curr;
     }
@@ -704,12 +708,12 @@ class Kernel {
         const moduleName = components[0];
         const assembly = this.assemblies.get(moduleName);
         if (!assembly) {
-            throw new Error(`Module '${moduleName}' not found`);
+            throw new JsiiFault(`Module '${moduleName}' not found`);
         }
         const types = (_a = assembly.metadata.types) !== null && _a !== void 0 ? _a : {};
         const fqnInfo = types[fqn];
         if (!fqnInfo) {
-            throw new Error(`Type '${fqn}' not found`);
+            throw new JsiiFault(`Type '${fqn}' not found`);
         }
         return fqnInfo;
     }
@@ -719,7 +723,7 @@ class Kernel {
             const addendum = interfaces && interfaces.length > 0
                 ? ` or interface(s) ${interfaces.join(', ')}`
                 : '';
-            throw new Error(`Class ${fqn}${addendum} doesn't have a method '${methodName}'`);
+            throw new JsiiFault(`Class ${fqn}${addendum} doesn't have a method '${methodName}'`);
         }
         return ti;
     }
@@ -773,7 +777,7 @@ class Kernel {
                 bases = (_a = interfaceTypeInfo.interfaces) !== null && _a !== void 0 ? _a : [];
             }
             else {
-                throw new Error(`Type of kind ${typeInfo.kind} does not have properties`);
+                throw new JsiiFault(`Type of kind ${typeInfo.kind} does not have properties`);
             }
             for (const p of properties !== null && properties !== void 0 ? properties : []) {
                 if (p.name === property) {
@@ -796,7 +800,7 @@ class Kernel {
             const addendum = interfaces && interfaces.length > 0
                 ? ` or interface(s) ${interfaces.join(', ')}`
                 : '';
-            throw new Error(`Type ${fqn}${addendum} doesn't have a property '${property}'`);
+            throw new JsiiFault(`Type ${fqn}${addendum} doesn't have a property '${property}'`);
         }
         return typeInfo;
     }
@@ -831,7 +835,7 @@ class Kernel {
             parametersCopy.push(parametersCopy[parametersCopy.length - 1]);
         }
         if (xs.length > parametersCopy.length) {
-            throw new Error(`Argument list (${JSON.stringify(xs)}) not same size as expected argument list (length ${parametersCopy.length})`);
+            throw new JsiiFault(`Argument list (${JSON.stringify(xs)}) not same size as expected argument list (length ${parametersCopy.length})`);
         }
         return xs.map((x, i) => boxUnbox(x, parametersCopy[i], `passed to parameter ${parametersCopy[i].name} of ${methodContext}`));
     }
@@ -863,6 +867,15 @@ class Kernel {
         try {
             return fn();
         }
+        catch (e) {
+            if (e.name === "@jsii/kernel.Fault" /* JsiiErrorType.JSII_FAULT */) {
+                throw new JsiiFault(e);
+            }
+            // This error can be thrown by the kernel directly, or it can be
+            // thrown from user code. If the error comes from the kernel, then its name field will be populated;
+            // if the error comes from user code, the name field will not be populated.
+            throw new RuntimeError(e);
+        }
         finally {
             delete this.syncInProgress;
         }

package/lib/objects.d.ts

@@ -17,7 +17,7 @@ export declare function objectReference(obj: unknown): api.ObjRef | undefined;
 /**
  * Set the JSII FQN for classes produced by a given constructor
  */
-export declare function tagJsiiConstructor(constructor: any, fqn: string, version: string): void;
+export declare function tagJsiiConstructor(constructor: any, fqn: string): void;
 /**
  * Table of JSII objects
  *

package/lib/objects.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectTable = exports.tagJsiiConstructor = exports.objectReference = exports.jsiiTypeFqn = void 0;
 const spec = require("@jsii/spec");
+const assert = require("assert");
 const api = require("./api");
+const kernel_1 = require("./kernel");
 const serialization_1 = require("./serialization");
 /**
  * Symbol under which we store the { type -> objid } map on object instances
@@ -13,9 +15,9 @@ const OBJID_SYMBOL = Symbol.for('$__jsii__objid__$');
  */
 const IFACES_SYMBOL = Symbol.for('$__jsii__interfaces__$');
 /**
- * Symbol we use to tag the constructor of a JSII class
+ * Symbol we use to tag constructors that are exported from a JSII module.
  */
-const JSII_RTTI_SYMBOL = Symbol.for('jsii.rtti');
+const JSII_TYPE_FQN_SYMBOL = Symbol('$__jsii__fqn__$');
 /**
  * Get the JSII fqn for an object (if available)
  *
@@ -24,8 +26,7 @@ const JSII_RTTI_SYMBOL = Symbol.for('jsii.rtti');
  * information.
  */
 function jsiiTypeFqn(obj) {
-    var _a;
-    return (_a = obj.constructor[JSII_RTTI_SYMBOL]) === null || _a === void 0 ? void 0 : _a.fqn;
+    return obj.constructor[JSII_TYPE_FQN_SYMBOL];
 }
 exports.jsiiTypeFqn = jsiiTypeFqn;
 /**
@@ -72,15 +73,17 @@ function tagObject(obj, objid, interfaces) {
 /**
  * Set the JSII FQN for classes produced by a given constructor
  */
-function tagJsiiConstructor(constructor, fqn, version) {
-    if (Object.prototype.hasOwnProperty.call(constructor, JSII_RTTI_SYMBOL)) {
-        return;
+function tagJsiiConstructor(constructor, fqn) {
+    if (Object.prototype.hasOwnProperty.call(constructor, JSII_TYPE_FQN_SYMBOL)) {
+        return assert(constructor[JSII_TYPE_FQN_SYMBOL] === fqn, `Unable to register ${constructor.name} as ${fqn}: it is already registerd with FQN ${constructor[JSII_TYPE_FQN_SYMBOL]}`);
     }
-    Object.defineProperty(constructor, JSII_RTTI_SYMBOL, {
+    // Mark this constructor as exported from a jsii module, so we know we
+    // should be considering it's FQN as a valid exported type.
+    Object.defineProperty(constructor, JSII_TYPE_FQN_SYMBOL, {
         configurable: false,
         enumerable: false,
         writable: false,
-        value: { fqn, version },
+        value: fqn,
     });
 }
 exports.tagJsiiConstructor = tagJsiiConstructor;
@@ -104,7 +107,7 @@ class ObjectTable {
     registerObject(obj, fqn, interfaces) {
         var _a;
         if (fqn === undefined) {
-            throw new Error('FQN cannot be undefined');
+            throw new kernel_1.JsiiFault('FQN cannot be undefined');
         }
         const existingRef = objectReference(obj);
         if (existingRef) {
@@ -138,12 +141,12 @@ class ObjectTable {
     findObject(objref) {
         var _a;
         if (typeof objref !== 'object' || !(api.TOKEN_REF in objref)) {
-            throw new Error(`Malformed object reference: ${JSON.stringify(objref)}`);
+            throw new kernel_1.JsiiFault(`Malformed object reference: ${JSON.stringify(objref)}`);
         }
         const objid = objref[api.TOKEN_REF];
         const obj = this.objects.get(objid);
         if (!obj) {
-            throw new Error(`Object ${objid} not found`);
+            throw new kernel_1.JsiiFault(`Object ${objid} not found`);
         }
         // If there are "additional" interfaces declared on the objref, merge them
         // into the returned object. This is used to support client-side forced
@@ -170,7 +173,7 @@ class ObjectTable {
      */
     deleteObject({ [api.TOKEN_REF]: objid }) {
         if (!this.objects.delete(objid)) {
-            throw new Error(`Object ${objid} not found`);
+            throw new kernel_1.JsiiFault(`Object ${objid} not found`);
         }
     }
     get count() {
@@ -204,7 +207,7 @@ class InterfaceCollection {
     addFromClass(fqn) {
         const ti = this.resolveType(fqn);
         if (!spec.isClassType(ti)) {
-            throw new Error(`Expected a class, but received ${spec.describeTypeReference(ti)}`);
+            throw new kernel_1.JsiiFault(`Expected a class, but received ${spec.describeTypeReference(ti)}`);
         }
         if (ti.base) {
             this.addFromClass(ti.base);
@@ -222,7 +225,7 @@ class InterfaceCollection {
     addFromInterface(fqn) {
         const ti = this.resolveType(fqn);
         if (!spec.isInterfaceType(ti)) {
-            throw new Error(`Expected an interface, but received ${spec.describeTypeReference(ti)}`);
+            throw new kernel_1.JsiiFault(`Expected an interface, but received ${spec.describeTypeReference(ti)}`);
         }
         if (!ti.interfaces) {
             return;

package/lib/recording.js

@@ -47,7 +47,7 @@ function recordInteraction(kernel, inputOutputLogPath) {
                                 ok(value);
                             })
                                 .catch((err) => {
-                                logOutput({ error: err.message });
+                                logOutput({ error: err.message, name: err.name });
                                 fail(err);
                             });
                         });
@@ -56,8 +56,11 @@ function recordInteraction(kernel, inputOutputLogPath) {
                     return ret;
                 }
                 catch (e) {
-                    logOutput({ error: e.message });
-                    throw e;
+                    logOutput({ error: e.message, name: e.name });
+                    if (e.type === "@jsii/kernel.RuntimeError" /* JsiiErrorType.RUNTIME_ERROR */) {
+                        throw new kernel_1.RuntimeError(e.message);
+                    }
+                    throw new kernel_1.JsiiFault(e.message);
                 }
             },
         });

package/lib/tar-cache/index.d.ts

@@ -1,10 +1,6 @@
 import * as tar from 'tar';
 export declare type ExtractOptions = Omit<tar.ExtractOptions & tar.FileOptions, 'file' | 'cwd'>;
 export interface ExtractResult {
-    /**
-     * The path in which the extracted files are located
-     */
-    readonly path: string;
     /**
      * When `'hit'`, the data was already present in cache and was returned from
      * cache.
@@ -25,7 +21,7 @@ export interface ExtractResult {
  *
  * @returns the result of the extraction.
  */
-export declare function extract(file: string, options: ExtractOptions, ...comments: readonly string[]): ExtractResult;
+export declare function extract(file: string, outDir: string, options: ExtractOptions, ...comments: readonly string[]): ExtractResult;
 /** @internal */
 export declare function getPackageCacheEnabled(): boolean;
 /** @internal */

package/lib/tar-cache/index.js

@@ -3,10 +3,9 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPackageCacheEnabled = exports.getPackageCacheEnabled = exports.extract = void 0;
 const fs_1 = require("fs");
-const os_1 = require("os");
-const path_1 = require("path");
 const tar = require("tar");
 const disk_cache_1 = require("../disk-cache");
+const link_1 = require("../link");
 const default_cache_root_1 = require("./default-cache-root");
 let packageCacheEnabled = ((_a = process.env.JSII_RUNTIME_PACKAGE_CACHE) === null || _a === void 0 ? void 0 : _a.toLocaleUpperCase()) === 'enabled';
 /**
@@ -18,27 +17,36 @@ let packageCacheEnabled = ((_a = process.env.JSII_RUNTIME_PACKAGE_CACHE) === nul
  *
  * @returns the result of the extraction.
  */
-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, { recursive: true });
+            // !!!IMPORTANT!!!
+            // Extract directly into the final target directory, as certain antivirus
+            // software configurations on Windows will make a `renameSync` operation
+            // fail with EPERM until the files have been fully analyzed.
+            (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, recursive: true });
@@ -49,11 +57,16 @@ function extractToCache(file, options = {}, ...comments) {
         lock.touch();
         return { path: entry.path, 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-'));
-    untarInto({ ...options, cwd: path, file });
-    return { path };
+function extractToOutDir(file, cwd, options = {}) {
+    // !!!IMPORTANT!!!
+    // Extract directly into the final target directory, as certain antivirus
+    // software configurations on Windows will make a `renameSync` operation
+    // fail with EPERM until the files have been fully analyzed.
+    untarInto({ ...options, cwd, file });
+    return {};
 }
 function untarInto(options) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/kernel",
-  "version": "1.67.0",
+  "version": "1.69.0",
   "description": "kernel for jsii execution environment",
   "license": "Apache-2.0",
   "author": {
@@ -31,19 +31,19 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/spec": "^1.67.0",
+    "@jsii/spec": "^1.69.0",
     "fs-extra": "^10.1.0",
     "lockfile": "^1.0.4",
     "tar": "^6.1.11"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.67.0",
-    "@scope/jsii-calc-lib": "^1.67.0",
+    "@scope/jsii-calc-base": "^1.69.0",
+    "@scope/jsii-calc-lib": "^1.69.0",
     "@types/fs-extra": "^9.0.13",
     "@types/lockfile": "^1.0.2",
     "@types/tar": "^6.1.2",
-    "jest-expect-message": "^1.0.2",
-    "jsii-build-tools": "^1.67.0",
+    "jest-expect-message": "^1.1.2",
+    "jsii-build-tools": "^1.69.0",
     "jsii-calc": "^3.20.120"
   }
 }