@jsii/kernel 1.70.0 → 1.72.0

package/lib/api.d.ts

@@ -1,3 +1,4 @@
+import { JsiiErrorType } from './kernel';
 export declare const TOKEN_REF = "$jsii.byref";
 export declare const TOKEN_INTERFACES = "$jsii.interfaces";
 export declare const TOKEN_DATE = "$jsii.date";
@@ -65,6 +66,16 @@ export interface LoadResponse {
     readonly assembly: string;
     readonly types: number;
 }
+export interface GetScriptCommandRequest {
+    readonly assembly: string;
+    readonly script: string;
+    readonly args?: string[];
+}
+export interface GetScriptCommandResponse {
+    command: string;
+    args: string[];
+    env: Record<string, string>;
+}
 export interface InvokeScriptRequest {
     readonly assembly: string;
     readonly script: string;
@@ -190,5 +201,6 @@ export interface OkayResponse {
 export interface ErrorResponse {
     readonly error: string;
     readonly stack?: string;
+    readonly name?: JsiiErrorType;
 }
 //# sourceMappingURL=api.d.ts.map

package/lib/kernel.d.ts

@@ -44,6 +44,7 @@ export declare class Kernel {
     constructor(callbackHandler: (callback: api.Callback) => any);
     load(req: api.LoadRequest): api.LoadResponse;
     private _load;
+    getBinScriptCommand(req: api.GetScriptCommandRequest): api.GetScriptCommandResponse;
     invokeBinScript(req: api.InvokeScriptRequest): api.InvokeScriptResponse;
     create(req: api.CreateRequest): api.CreateResponse;
     del(req: api.DelRequest): api.DelResponse;
@@ -94,6 +95,10 @@ export declare class Kernel {
      */
     private _ensureSync;
     private _findPropertyTarget;
+    /**
+     * Shared (non-public implementation) to as not to break API recording.
+     */
+    private _getBinScriptCommand;
     private _makecbid;
     private _makeprid;
 }

package/lib/kernel.js

@@ -116,38 +116,22 @@ class Kernel {
             types: Object.keys((_c = assmSpec.types) !== null && _c !== void 0 ? _c : {}).length,
         };
     }
+    getBinScriptCommand(req) {
+        return this._getBinScriptCommand(req);
+    }
     invokeBinScript(req) {
-        var _a;
-        const packageDir = this._getPackageDir(req.assembly);
-        if (fs.pathExistsSync(packageDir)) {
-            // module exists, verify version
-            const epkg = fs.readJsonSync(path.join(packageDir, 'package.json'));
-            if (!epkg.bin) {
-                throw new JsiiFault('There is no bin scripts defined for this package.');
-            }
-            const scriptPath = epkg.bin[req.script];
-            if (!epkg.bin) {
-                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',
-                env: {
-                    ...process.env,
-                    // Make sure the current NODE_OPTIONS are honored if we shell out to node
-                    NODE_OPTIONS: process.execArgv.join(' '),
-                    // Make sure "this" node is ahead of $PATH just in case
-                    PATH: `${path.dirname(process.execPath)}:${process.env.PATH}`,
-                },
-                shell: true,
-            });
-            return {
-                stdout: result.stdout,
-                stderr: result.stderr,
-                status: result.status,
-                signal: result.signal,
-            };
-        }
-        throw new JsiiFault(`Package with name ${req.assembly} was not loaded.`);
+        const { command, args, env } = this._getBinScriptCommand(req);
+        const result = cp.spawnSync(command, args, {
+            encoding: 'utf-8',
+            env,
+            shell: true,
+        });
+        return {
+            stdout: result.stdout,
+            stderr: result.stderr,
+            status: result.status,
+            signal: result.signal,
+        };
     }
     create(req) {
         return this._create(req);
@@ -303,10 +287,16 @@ class Kernel {
         catch (e) {
             this._debug('promise error:', e);
             if (e.name === "@jsii/kernel.Fault" /* JsiiErrorType.JSII_FAULT */) {
+                if (e instanceof JsiiFault) {
+                    throw e;
+                }
                 throw new JsiiFault(e.message);
             }
             // default to RuntimeError, since non-kernel errors may not
             // have their `name` field defined
+            if (e instanceof RuntimeError) {
+                throw e;
+            }
             throw new RuntimeError(e);
         }
         return {
@@ -876,11 +866,17 @@ class Kernel {
         }
         catch (e) {
             if (e.name === "@jsii/kernel.Fault" /* JsiiErrorType.JSII_FAULT */) {
+                if (e instanceof JsiiFault) {
+                    throw e;
+                }
                 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.
+            if (e instanceof RuntimeError) {
+                throw e;
+            }
             throw new RuntimeError(e);
         }
         finally {
@@ -894,6 +890,33 @@ class Kernel {
         }
         return property;
     }
+    /**
+     * Shared (non-public implementation) to as not to break API recording.
+     */
+    _getBinScriptCommand(req) {
+        var _a, _b;
+        const packageDir = this._getPackageDir(req.assembly);
+        if (fs.pathExistsSync(packageDir)) {
+            // module exists, verify version
+            const epkg = fs.readJsonSync(path.join(packageDir, 'package.json'));
+            const scriptPath = (_a = epkg.bin) === null || _a === void 0 ? void 0 : _a[req.script];
+            if (!epkg.bin) {
+                throw new JsiiFault(`Script with name ${req.script} was not defined.`);
+            }
+            return {
+                command: path.join(packageDir, scriptPath),
+                args: (_b = req.args) !== null && _b !== void 0 ? _b : [],
+                env: {
+                    ...process.env,
+                    // Make sure the current NODE_OPTIONS are honored if we shell out to node
+                    NODE_OPTIONS: process.execArgv.join(' '),
+                    // Make sure "this" node is ahead of $PATH just in case
+                    PATH: `${path.dirname(process.execPath)}:${process.env.PATH}`,
+                },
+            };
+        }
+        throw new JsiiFault(`Package with name ${req.assembly} was not loaded.`);
+    }
     //
     // type information
     //

package/package.json

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