skuba 4.2.0-beta.6 → 4.2.1

package/lib/utils/error.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { inspect } from 'util';
 import * as t from 'runtypes';
 export declare type ConcurrentlyErrors = t.Static<typeof ConcurrentlyErrors>;
 export declare const ConcurrentlyErrors: t.Array<t.Record<{
@@ -8,6 +10,18 @@ export declare const ConcurrentlyErrors: t.Array<t.Record<{
     index: t.Number;
     exitCode: t.Number;
 }, false>, false>;
+/**
+ * Creates an error that returns its plain `message` rather than a full stack
+ * trace when `util.inspect`ed.
+ *
+ * This can be useful for terser handling and logging of known error scenarios
+ * that have descriptive messages.
+ *
+ * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects
+ */
+export declare const createTerseError: (message?: string | undefined) => Error & {
+    [inspect.custom]: () => string | undefined;
+};
 export declare const handleCliError: (err: unknown) => void;
 export declare const isErrorWithCode: <T>(err: unknown, code: T) => err is Record<PropertyKey, unknown> & {
     code: T;

package/lib/utils/error.js

@@ -24,7 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isErrorWithCode = exports.handleCliError = exports.ConcurrentlyErrors = void 0;
+exports.isErrorWithCode = exports.handleCliError = exports.createTerseError = exports.ConcurrentlyErrors = void 0;
+const util_1 = require("util");
 const t = __importStar(require("runtypes"));
 const logging_1 = require("./logging");
 const validation_1 = require("./validation");
@@ -36,13 +37,26 @@ exports.ConcurrentlyErrors = t.Array(t.Record({
     index: t.Number,
     exitCode: t.Number,
 }));
+/**
+ * Creates an error that returns its plain `message` rather than a full stack
+ * trace when `util.inspect`ed.
+ *
+ * This can be useful for terser handling and logging of known error scenarios
+ * that have descriptive messages.
+ *
+ * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects
+ */
+const createTerseError = (message) => Object.assign(new Error(message), {
+    [util_1.inspect.custom]: () => message,
+});
+exports.createTerseError = createTerseError;
 const isExecaError = (err) => (0, validation_1.hasNumberProp)(err, 'exitCode');
 const handleCliError = (err) => {
     if (isExecaError(err)) {
         process.exitCode = err.exitCode;
         return;
     }
-    logging_1.log.err(err);
+    logging_1.log.err((0, util_1.inspect)(err));
     process.exitCode = 1;
     return;
 };

package/lib/utils/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;AAG5B,4CAA8B;AAE9B,uCAAgC;AAChC,6CAAsD;AAIzC,QAAA,kBAAkB,GAAG,CAAC,CAAC,KAAK,CACvC,CAAC,CAAC,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM;KACf,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,QAAQ,EAAE,CAAC,CAAC,MAAM;CACnB,CAAC,CACH,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAY,EAAqB,EAAE,CACvD,IAAA,0BAAa,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AAE1B,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE;IAC7C,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAChC,OAAO;KACR;IAED,aAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACrB,OAAO;AACT,CAAC,CAAC;AATW,QAAA,cAAc,kBASzB;AAEK,MAAM,eAAe,GAAG,CAC7B,GAAY,EACZ,IAAO,EAC4C,EAAE,CACrD,IAAA,oBAAO,EAAC,GAAG,EAAE,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC;AAJ/B,QAAA,eAAe,mBAIgB"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5B,+BAA+B;AAG/B,4CAA8B;AAE9B,uCAAgC;AAChC,6CAAsD;AAIzC,QAAA,kBAAkB,GAAG,CAAC,CAAC,KAAK,CACvC,CAAC,CAAC,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM;KACf,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,QAAQ,EAAE,CAAC,CAAC,MAAM;CACnB,CAAC,CACH,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACnD,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;IAChC,CAAC,cAAO,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO;CAChC,CAAC,CAAC;AAHQ,QAAA,gBAAgB,oBAGxB;AAEL,MAAM,YAAY,GAAG,CAAC,GAAY,EAAqB,EAAE,CACvD,IAAA,0BAAa,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AAE1B,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE;IAC7C,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAChC,OAAO;KACR;IAED,aAAG,CAAC,GAAG,CAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,CAAC;IACtB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACrB,OAAO;AACT,CAAC,CAAC;AATW,QAAA,cAAc,kBASzB;AAEK,MAAM,eAAe,GAAG,CAC7B,GAAY,EACZ,IAAO,EAC4C,EAAE,CACrD,IAAA,oBAAO,EAAC,GAAG,EAAE,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC;AAJ/B,QAAA,eAAe,mBAIgB"}

package/lib/utils/exec.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -55,18 +46,22 @@ const envWithPath = {
     PATH: (0, npm_run_path_1.default)({ cwd: __dirname }),
 };
 const runCommand = (command, args, opts) => {
-    var _a, _b, _c, _d;
-    const subprocess = (0, execa_1.default)(command, args, Object.assign({ localDir: __dirname, preferLocal: true, stdio: 'inherit' }, opts));
-    switch (opts === null || opts === void 0 ? void 0 : opts.streamStdio) {
+    const subprocess = (0, execa_1.default)(command, args, {
+        localDir: __dirname,
+        preferLocal: true,
+        stdio: 'inherit',
+        ...opts,
+    });
+    switch (opts?.streamStdio) {
         case 'yarn':
             const stderrFilter = new YarnWarningFilter();
             const stdoutFilter = new YarnSpamFilter();
-            (_a = subprocess.stderr) === null || _a === void 0 ? void 0 : _a.pipe(stderrFilter).pipe(process.stderr);
-            (_b = subprocess.stdout) === null || _b === void 0 ? void 0 : _b.pipe(stdoutFilter).pipe(process.stdout);
+            subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);
+            subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);
             break;
         case true:
-            (_c = subprocess.stderr) === null || _c === void 0 ? void 0 : _c.pipe(process.stderr);
-            (_d = subprocess.stdout) === null || _d === void 0 ? void 0 : _d.pipe(process.stdout);
+            subprocess.stderr?.pipe(process.stderr);
+            subprocess.stdout?.pipe(process.stdout);
             break;
     }
     return subprocess;
@@ -77,16 +72,17 @@ const createExec = (opts) => (command, ...args) => runCommand(command, args, opt
 exports.createExec = createExec;
 const exec = (command, ...args) => runCommand(command, args);
 exports.exec = exec;
-const execConcurrently = (commands, { maxProcesses, nameLength, outputStream } = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const maxNameLength = nameLength !== null && nameLength !== void 0 ? nameLength : commands.reduce((length, command) => Math.max(length, command.name.length), 0);
+const execConcurrently = async (commands, { maxProcesses, nameLength, outputStream } = {}) => {
+    const maxNameLength = nameLength ??
+        commands.reduce((length, command) => Math.max(length, command.name.length), 0);
     try {
-        yield (0, concurrently_1.default)(commands.map(({ command, name, prefixColor }) => ({
+        await (0, concurrently_1.default)(commands.map(({ command, name, prefixColor }) => ({
             command,
             env: envWithPath,
             name: name.padEnd(maxNameLength),
             prefixColor,
         })), {
-            maxProcesses: maxProcesses !== null && maxProcesses !== void 0 ? maxProcesses : (0, os_1.cpus)().length,
+            maxProcesses: maxProcesses ?? (0, os_1.cpus)().length,
             outputStream,
             // Use a minimalist logging prefix.
             prefix: '{name} │',
@@ -103,25 +99,25 @@ const execConcurrently = (commands, { maxProcesses, nameLength, outputStream } =
             .map((subprocess) => subprocess.command.name);
         throw Error(`${failed.join(', ')} subprocess${failed.length === 1 ? '' : 'es'} failed.`);
     }
-});
+};
 exports.execConcurrently = execConcurrently;
-const ensureCommands = (...names) => __awaiter(void 0, void 0, void 0, function* () {
+const ensureCommands = async (...names) => {
     let success = true;
-    yield Promise.all(names.map((name) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield (0, exports.hasCommand)(name);
+    await Promise.all(names.map(async (name) => {
+        const result = await (0, exports.hasCommand)(name);
         if (!result) {
             success = false;
             logging_1.log.err(logging_1.log.bold(name), 'needs to be installed.');
         }
-    })));
+    }));
     if (!success) {
         process.exit(1);
     }
-});
+};
 exports.ensureCommands = ensureCommands;
-const hasCommand = (name) => __awaiter(void 0, void 0, void 0, function* () {
+const hasCommand = async (name) => {
     try {
-        yield which(name);
+        await which(name);
         return true;
     }
     catch (err) {
@@ -130,6 +126,6 @@ const hasCommand = (name) => __awaiter(void 0, void 0, void 0, function* () {
         }
         throw err;
     }
-});
+};
 exports.hasCommand = hasCommand;
 //# sourceMappingURL=exec.js.map

package/lib/utils/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA0B;AAC1B,oDAA4B;AAC5B,gDAAwB;AAGxB,gEAAwC;AAExC,kDAA0B;AAC1B,gEAAsC;AACtC,0DAAiC;AAEjC,mCAA8D;AAC9D,uCAAgC;AAEhC,MAAM,cAAe,SAAQ,gBAAM,CAAC,SAAS;IAA7C;;QACE,aAAQ,GAAG,KAAK,CAAC;IAwBnB,CAAC;IAtBC,UAAU,CACR,KAAiB,EACjB,SAAyB,EACzB,QAAkC;QAElC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE1C,qEAAqE;QACrE,IAAI,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE;YAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACtB;QAED,IACE,CAAC,IAAI,CAAC,QAAQ;YACd,gEAAgE;YAChE,CAAC,GAAG,CAAC,UAAU,CAAC,wBAAwB,CAAC,EACzC;YACA,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,QAAQ,EAAE,CAAC;IACb,CAAC;CACF;AAED,MAAM,iBAAkB,SAAQ,gBAAM,CAAC,SAAS;IAC9C,UAAU,CACR,KAAiB,EACjB,SAAyB,EACzB,QAAkC;QAElC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE1C,0EAA0E;QAC1E,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,QAAQ,EAAE,CAAC;IACb,CAAC;CACF;AAsCD,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,IAAA,sBAAU,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;IACzE,MAAM,UAAU,GAAG,IAAA,eAAK,EAAC,OAAO,EAAE,IAAI,EAAE;QACtC,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,SAAS;QAChB,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,QAAQ,IAAI,EAAE,WAAW,EAAE;QACzB,KAAK,MAAM;YACT,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7C,MAAM,YAAY,GAAG,IAAI,cAAc,EAAE,CAAC;YAE1C,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC3D,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3D,MAAM;QAER,KAAK,IAAI;YACP,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAExC,MAAM;KACT;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,IAAA,mBAAQ,EAAC,SAAS,CAAC,CAAC;AAE1C,MAAM,KAAK,GAAG,cAAI,CAAC,SAAS,CAAiB,aAAa,CAAC,CAAC;AAErD,MAAM,UAAU,GACrB,CAAC,IAAiB,EAAQ,EAAE,CAC5B,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CACnB,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAHvB,QAAA,UAAU,cAGa;AAE7B,MAAM,IAAI,GAAS,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAA7D,QAAA,IAAI,QAAyD;AAEnE,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAmC,EACnC,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,KAA8B,EAAE,EACxE,EAAE;IACF,MAAM,aAAa,GACjB,UAAU;QACV,QAAQ,CAAC,MAAM,CACb,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAC1D,CAAC,CACF,CAAC;IAEJ,IAAI;QACF,MAAM,IAAA,sBAAY,EAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;YAChD,OAAO;YACP,GAAG,EAAE,WAAW;YAChB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAChC,WAAW;SACZ,CAAC,CAAC,EACH;YACE,YAAY,EAAE,YAAY,IAAI,IAAA,SAAI,GAAE,CAAC,MAAM;YAE3C,YAAY;YAEZ,mCAAmC;YACnC,MAAM,EAAE,UAAU;SACnB,CACF,CAAC,MAAM,CAAC;KACV;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,MAAM,GAAG,0BAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,GAAG,CAAC;SACX;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK;aACxB,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,KAAK,CAAC,CAAC;aACxC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC;aAC/D,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,KAAK,CACT,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAClB,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAC7B,UAAU,CACX,CAAC;KACH;AACH,CAAC,CAAC;AA9CW,QAAA,gBAAgB,oBA8C3B;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,GAAG,KAAe,EAAE,EAAE;IACzD,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC;QAEtC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,GAAG,KAAK,CAAC;YAEhB,aAAG,CAAC,GAAG,CAAC,aAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,wBAAwB,CAAC,CAAC;SACnD;IACH,CAAC,CAAC,CACH,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AAlBW,QAAA,cAAc,kBAkBzB;AAEK,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC/C,IAAI;QACF,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAElB,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,IAAA,uBAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;YAClC,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,CAAC;KACX;AACH,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB"}

package/lib/utils/logo.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,11 +14,10 @@ const LOGO = chalk_1.default.blueBright(`
 │_ ─┤  <${chalk_1.default.magentaBright('│ ╵ │')} • │ • │
 ╰───╰─┴─${chalk_1.default.magentaBright('╰───╯')}───╯── ╰
 `);
-const showLogoAndVersionInfo = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const versionInfo = yield (0, version_1.getSkubaVersionInfo)();
+const showLogoAndVersionInfo = async () => {
+    const versionInfo = await (0, version_1.getSkubaVersionInfo)();
     logging_1.log.plain(LOGO);
-    logging_1.log.subtle(logging_1.log.bold(versionInfo.local), '|', 'latest', logging_1.log.bold((_a = versionInfo.latest) !== null && _a !== void 0 ? _a : 'offline ✈'));
+    logging_1.log.subtle(logging_1.log.bold(versionInfo.local), '|', 'latest', logging_1.log.bold(versionInfo.latest ?? 'offline ✈'));
     logging_1.log.newline();
     if (versionInfo.isStale) {
         logging_1.log.warn('Your skuba installation is out of date.');
@@ -37,6 +27,6 @@ const showLogoAndVersionInfo = () => __awaiter(void 0, void 0, void 0, function*
         logging_1.log.newline();
     }
     return versionInfo;
-});
+};
 exports.showLogoAndVersionInfo = showLogoAndVersionInfo;
 //# sourceMappingURL=logo.js.map

package/lib/utils/logo.js.map

@@ -1 +1 @@
-{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,kFAAwD;AAExD,uCAAgC;AAChC,uCAAgD;AAEhD,MAAM,IAAI,GAAG,eAAK,CAAC,UAAU,CAAC;UACpB,eAAK,CAAC,aAAa,CAAC,MAAM,CAAC;UAC3B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;CACrC,CAAC,CAAC;AAEI,MAAM,sBAAsB,GAAG,GAAS,EAAE;;IAC/C,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAmB,GAAE,CAAC;IAEhD,aAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,aAAG,CAAC,MAAM,CACR,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAC3B,GAAG,EACH,QAAQ,EACR,aAAG,CAAC,IAAI,CAAC,MAAA,WAAW,CAAC,MAAM,mCAAI,WAAW,CAAC,CAC5C,CAAC;IACF,aAAG,CAAC,OAAO,EAAE,CAAC;IAEd,IAAI,WAAW,CAAC,OAAO,EAAE;QACvB,aAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QACpD,aAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChC,aAAG,CAAC,OAAO,EAAE,CAAC;QACd,aAAG,CAAC,IAAI,CACN,aAAG,CAAC,IAAI,CACN,MAAM,EACN,GAAG,CAAC,+BAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAC1C,SAAS,EACT,SAAS,WAAW,CAAC,MAAM,EAAE,CAC9B,CACF,CAAC;QACF,aAAG,CAAC,OAAO,EAAE,CAAC;KACf;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAA,CAAC;AA5BW,QAAA,sBAAsB,0BA4BjC"}
+{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,kFAAwD;AAExD,uCAAgC;AAChC,uCAAgD;AAEhD,MAAM,IAAI,GAAG,eAAK,CAAC,UAAU,CAAC;UACpB,eAAK,CAAC,aAAa,CAAC,MAAM,CAAC;UAC3B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;CACrC,CAAC,CAAC;AAEI,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC/C,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAmB,GAAE,CAAC;IAEhD,aAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,aAAG,CAAC,MAAM,CACR,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAC3B,GAAG,EACH,QAAQ,EACR,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,CAC5C,CAAC;IACF,aAAG,CAAC,OAAO,EAAE,CAAC;IAEd,IAAI,WAAW,CAAC,OAAO,EAAE;QACvB,aAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QACpD,aAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChC,aAAG,CAAC,OAAO,EAAE,CAAC;QACd,aAAG,CAAC,IAAI,CACN,aAAG,CAAC,IAAI,CACN,MAAM,EACN,GAAG,CAAC,+BAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAC1C,SAAS,EACT,SAAS,WAAW,CAAC,MAAM,EAAE,CAC9B,CACF,CAAC;QACF,aAAG,CAAC,OAAO,EAAE,CAAC;KACf;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AA5BW,QAAA,sBAAsB,0BA4BjC"}

package/lib/utils/manifest.js

@@ -23,15 +23,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -44,25 +35,25 @@ exports.ProjectType = t.Union(t.Literal('application'), t.Literal('package'));
 exports.PROJECT_TYPES = ['application', 'package'];
 const DEFAULT_ENTRY_POINT = 'src/app.ts';
 let skubaManifest;
-const getSkubaManifest = () => __awaiter(void 0, void 0, void 0, function* () {
+const getSkubaManifest = async () => {
     if (skubaManifest !== undefined) {
         return skubaManifest;
     }
-    const result = yield (0, read_pkg_up_1.default)({ cwd: __dirname });
+    const result = await (0, read_pkg_up_1.default)({ cwd: __dirname });
     if (result === undefined) {
         throw Error('skuba could not find its own manifest');
     }
     return (skubaManifest = result.packageJson);
-});
+};
 exports.getSkubaManifest = getSkubaManifest;
 const getConsumerManifest = () => (0, read_pkg_up_1.default)();
 exports.getConsumerManifest = getConsumerManifest;
-const getEntryPointFromManifest = () => __awaiter(void 0, void 0, void 0, function* () {
-    const result = yield (0, exports.getConsumerManifest)();
+const getEntryPointFromManifest = async () => {
+    const result = await (0, exports.getConsumerManifest)();
     return result !== undefined &&
         (0, validation_1.hasStringProp)(result.packageJson.skuba, 'entryPoint')
         ? result.packageJson.skuba.entryPoint
         : DEFAULT_ENTRY_POINT;
-});
+};
 exports.getEntryPointFromManifest = getEntryPointFromManifest;
 //# sourceMappingURL=manifest.js.map

package/lib/utils/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/utils/manifest.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG5B,8DAAoC;AACpC,4CAA8B;AAE9B,6CAA6C;AAIhC,QAAA,WAAW,GAAG,CAAC,CAAC,KAAK,CAChC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EACxB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CACrB,CAAC;AAEW,QAAA,aAAa,GAAG,CAAC,aAAa,EAAE,SAAS,CAAU,CAAC;AAEjE,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAEzC,IAAI,aAAgD,CAAC;AAE9C,MAAM,gBAAgB,GAAG,GAAyC,EAAE;IACzE,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAEnD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,KAAK,CAAC,uCAAuC,CAAC,CAAC;KACtD;IAED,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAA,qBAAS,GAAE,CAAC;AAAxC,QAAA,mBAAmB,uBAAqB;AAE9C,MAAM,yBAAyB,GAAG,GAAS,EAAE;IAClD,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAmB,GAAE,CAAC;IAE3C,OAAO,MAAM,KAAK,SAAS;QACzB,IAAA,0BAAa,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC;QACrD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU;QACrC,CAAC,CAAC,mBAAmB,CAAC;AAC1B,CAAC,CAAA,CAAC;AAPW,QAAA,yBAAyB,6BAOpC"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/utils/manifest.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG5B,8DAAoC;AACpC,4CAA8B;AAE9B,6CAA6C;AAIhC,QAAA,WAAW,GAAG,CAAC,CAAC,KAAK,CAChC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EACxB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CACrB,CAAC;AAEW,QAAA,aAAa,GAAG,CAAC,aAAa,EAAE,SAAS,CAAU,CAAC;AAEjE,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAEzC,IAAI,aAAgD,CAAC;AAE9C,MAAM,gBAAgB,GAAG,KAAK,IAAoC,EAAE;IACzE,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAEnD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,KAAK,CAAC,uCAAuC,CAAC,CAAC;KACtD;IAED,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAA,qBAAS,GAAE,CAAC;AAAxC,QAAA,mBAAmB,uBAAqB;AAE9C,MAAM,yBAAyB,GAAG,KAAK,IAAI,EAAE;IAClD,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAmB,GAAE,CAAC;IAE3C,OAAO,MAAM,KAAK,SAAS;QACzB,IAAA,0BAAa,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC;QACrD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU;QACrC,CAAC,CAAC,mBAAmB,CAAC;AAC1B,CAAC,CAAC;AAPW,QAAA,yBAAyB,6BAOpC"}

package/lib/utils/version.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,24 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSkubaVersionInfo = exports.getSkubaVersion = void 0;
 const latest_version_1 = __importDefault(require("latest-version"));
 const manifest_1 = require("./manifest");
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-const latestSkubaVersion = () => __awaiter(void 0, void 0, void 0, function* () {
+const wait_1 = require("./wait");
+const latestSkubaVersion = async () => {
     try {
-        // Don't pull an Apple; bail out before holding up the command for too long
-        const result = yield Promise.race([(0, latest_version_1.default)('skuba'), sleep(2000)]);
-        return typeof result === 'string' ? result : null;
+        const result = await (0, wait_1.withTimeout)((0, latest_version_1.default)('skuba'), { s: 2 });
+        return result.ok ? result.value : null;
     }
-    catch (_a) {
+    catch {
         return null;
     }
-});
-const getSkubaVersion = () => __awaiter(void 0, void 0, void 0, function* () {
-    const { version } = yield (0, manifest_1.getSkubaManifest)();
+};
+const getSkubaVersion = async () => {
+    const { version } = await (0, manifest_1.getSkubaManifest)();
     return version;
-});
+};
 exports.getSkubaVersion = getSkubaVersion;
-const getSkubaVersionInfo = () => __awaiter(void 0, void 0, void 0, function* () {
-    const [local, latest] = yield Promise.all([
+const getSkubaVersionInfo = async () => {
+    const [local, latest] = await Promise.all([
         (0, exports.getSkubaVersion)(),
         latestSkubaVersion(),
     ]);
@@ -49,6 +39,6 @@ const getSkubaVersionInfo = () => __awaiter(void 0, void 0, void 0, function* ()
         local,
         latest,
     };
-});
+};
 exports.getSkubaVersionInfo = getSkubaVersionInfo;
 //# sourceMappingURL=version.js.map

package/lib/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,yCAA8C;AAE9C,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAC3B,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1D,MAAM,kBAAkB,GAAG,GAAiC,EAAE;IAC5D,IAAI;QACF,2EAA2E;QAC3E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,KAAK,CAAC,IAAK,CAAC,CAAC,CAAC,CAAC;QAE1E,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;KACnD;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAA,CAAC;AAEK,MAAM,eAAe,GAAG,GAA0B,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAA,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,GAAoC,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAA,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAE3C,yCAA8C;AAC9C,iCAAqC;AAErC,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}

package/lib/utils/wait.d.ts

@@ -0,0 +1,17 @@
+interface Timeout extends PromiseLike<void> {
+    clear?: () => void;
+}
+export declare const sleep: (ms: number) => Timeout;
+export declare const throwOnTimeout: <T>(promise: PromiseLike<T>, { s }: {
+    s: number;
+}) => Promise<T>;
+declare type TimeoutResult<T> = {
+    ok: true;
+    value: T;
+} | {
+    ok: false;
+};
+export declare const withTimeout: <T>(promise: T | PromiseLike<T>, { s }: {
+    s: number;
+}) => Promise<TimeoutResult<T>>;
+export {};

package/lib/utils/wait.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withTimeout = exports.throwOnTimeout = exports.sleep = void 0;
+const error_1 = require("./error");
+const logging_1 = require("./logging");
+const sleep = (ms) => {
+    let timeout;
+    return Object.assign(new Promise((resolve) => (timeout = setTimeout(resolve, ms))), { clear: () => clearTimeout(timeout) });
+};
+exports.sleep = sleep;
+const throwOnTimeout = async (promise, { s }) => {
+    const result = await (0, exports.withTimeout)(promise, { s });
+    if (!result.ok) {
+        throw (0, error_1.createTerseError)(`Timed out after ${(0, logging_1.pluralise)(s, 'second')}`);
+    }
+    return result.value;
+};
+exports.throwOnTimeout = throwOnTimeout;
+const withTimeout = async (promise, { s }) => {
+    const timeout = (0, exports.sleep)(s * 1000);
+    try {
+        return await Promise.race([
+            Promise.resolve(promise).then((value) => ({ ok: true, value })),
+            timeout.then(() => ({ ok: false })),
+        ]);
+    }
+    finally {
+        timeout.clear?.();
+    }
+};
+exports.withTimeout = withTimeout;
+//# sourceMappingURL=wait.js.map

package/lib/utils/wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/utils/wait.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAC3C,uCAAsC;AAM/B,MAAM,KAAK,GAAG,CAAC,EAAU,EAAW,EAAE;IAC3C,IAAI,OAAuB,CAAC;IAE5B,OAAO,MAAM,CAAC,MAAM,CAClB,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EACnE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CACvC,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,KAAK,SAOhB;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,OAAuB,EACvB,EAAE,CAAC,EAAiB,EACR,EAAE;IACd,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAW,EAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;QACd,MAAM,IAAA,wBAAgB,EAAC,mBAAmB,IAAA,mBAAS,EAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;KACrE;IAED,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB;AAIK,MAAM,WAAW,GAAG,KAAK,EAC9B,OAA2B,EAC3B,EAAE,CAAC,EAAiB,EACO,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAA,aAAK,EAAC,CAAC,GAAG,IAAK,CAAC,CAAC;IAEjC,IAAI;QACF,OAAO,MAAM,OAAO,CAAC,IAAI,CAAmB;YAC1C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;SACpC,CAAC,CAAC;KACJ;YAAS;QACR,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KACnB;AACH,CAAC,CAAC;AAdW,QAAA,WAAW,eActB"}

package/lib/utils/worker.js

@@ -1,21 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postWorkerOutput = exports.execWorkerThread = void 0;
+const util_1 = require("util");
 const worker_threads_1 = require("worker_threads");
 const logging_1 = require("./logging");
 /**
  * Executes a script at `filepath` in a Node.js worker thread.
  */
-const execWorkerThread = (filepath, input) => __awaiter(void 0, void 0, void 0, function* () {
+const execWorkerThread = async (filepath, input) => {
     let output;
     let messageReceived = false;
     return new Promise((resolve, reject) => new worker_threads_1.Worker(filepath, {
@@ -33,7 +25,7 @@ const execWorkerThread = (filepath, input) => __awaiter(void 0, void 0, void 0,
         messageReceived = true;
     })
         .on('messageerror', (err) => reject(err)));
-});
+};
 exports.execWorkerThread = execWorkerThread;
 /**
  * Runs a function in a Node.js worker thread context, forwarding the result
@@ -48,7 +40,7 @@ const postWorkerOutput = (fn, logger = logging_1.log) => {
     fn(worker_threads_1.workerData)
         .then((output) => port.postMessage(output))
         .catch((err) => {
-        logger.err(err);
+        logger.err((0, util_1.inspect)(err));
         process.exit(1);
     });
 };

package/lib/utils/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/utils/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgE;AAEhE,uCAAgC;AAEhC;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAC9B,QAAgB,EAChB,KAAY,EACZ,EAAE;IACF,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,uBAAM,CAAC,QAAQ,EAAE;QACnB,UAAU,EAAE,KAAK;KAClB,CAAC;SACC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACnB,eAAe;QACb,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACjB,CAAC,CAAC,MAAM,CACJ,IAAI,KAAK,CACP,IAAI;YACF,CAAC,CAAC,uCAAuC,IAAI,EAAE;YAC/C,CAAC,CAAC,gDAAgD,CACrD,CACF,CACN;SACA,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;QACjC,0DAA0D;QAC1D,MAAM,GAAG,OAAO,CAAC;QACjB,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC;SACD,EAAE,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAA,CAAC;AA9BW,QAAA,gBAAgB,oBA8B3B;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,EAAqC,EACrC,MAAM,GAAG,aAAG,EACZ,EAAE;IACF,MAAM,IAAI,GAAG,2BAAU,CAAC;IAExB,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAE3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,EAAE,CAAC,2BAAmB,CAAC;SACpB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEhB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/utils/worker.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,mDAAgE;AAEhE,uCAAgC;AAEhC;;GAEG;AACI,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAgB,EAChB,KAAY,EACZ,EAAE;IACF,IAAI,MAAc,CAAC;IACnB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAI,uBAAM,CAAC,QAAQ,EAAE;QACnB,UAAU,EAAE,KAAK;KAClB,CAAC;SACC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACnB,eAAe;QACb,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACjB,CAAC,CAAC,MAAM,CACJ,IAAI,KAAK,CACP,IAAI;YACF,CAAC,CAAC,uCAAuC,IAAI,EAAE;YAC/C,CAAC,CAAC,gDAAgD,CACrD,CACF,CACN;SACA,EAAE,CAAC,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;QACjC,0DAA0D;QAC1D,MAAM,GAAG,OAAO,CAAC;QACjB,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC,CAAC;SACD,EAAE,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,gBAAgB,oBA8B3B;AAEF;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAC9B,EAAqC,EACrC,MAAM,GAAG,aAAG,EACZ,EAAE;IACF,MAAM,IAAI,GAAG,2BAAU,CAAC;IAExB,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;QAE3E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,EAAE,CAAC,2BAAmB,CAAC;SACpB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,CAAC,GAAG,CAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,CAAC;QAEzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B"}

package/lib/wrapper/functionHandler.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,7 +11,7 @@ const http_1 = require("./http");
 /**
  * Create an HTTP server that calls into an exported function.
  */
-const runFunctionHandler = ({ availablePort, entryPoint, functionName, }) => __awaiter(void 0, void 0, void 0, function* () {
+const runFunctionHandler = async ({ availablePort, entryPoint, functionName, }) => {
     if (!(0, validation_1.isObject)(entryPoint)) {
         logging_1.log.subtle(logging_1.log.bold(functionName), 'is not exported');
         return;
@@ -36,6 +27,6 @@ const runFunctionHandler = ({ availablePort, entryPoint, functionName, }) => __a
         .join(', ')})`);
     const requestListener = (0, http_1.createRequestListenerFromFunction)(fn);
     return (0, http_1.serveRequestListener)(requestListener, availablePort);
-});
+};
 exports.runFunctionHandler = runFunctionHandler;
 //# sourceMappingURL=functionHandler.js.map

package/lib/wrapper/functionHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"functionHandler.js","sourceRoot":"","sources":["../../src/wrapper/functionHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4EAAwC;AAExC,8CAAuC;AACvC,oDAA2D;AAE3D,iCAGgB;AAQhB;;GAEG;AACI,MAAM,kBAAkB,GAAG,CAAO,EACvC,aAAa,EACb,UAAU,EACV,YAAY,GACP,EAAiB,EAAE;IACxB,IAAI,CAAC,IAAA,qBAAQ,EAAC,UAAU,CAAC,EAAE;QACzB,aAAG,CAAC,MAAM,CAAC,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACtD,OAAO;KACR;IAED,MAAM,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAEpC,IAAI,CAAC,IAAA,uBAAU,EAAC,EAAE,CAAC,EAAE;QACnB,aAAG,CAAC,MAAM,CAAC,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC,CAAC;QACxD,OAAO;KACR;IAED,aAAG,CAAC,IAAI,CACN,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EACtB,IAAI,IAAA,4BAAM,EAAC,EAAE,CAAC;QACZ,+CAA+C;SAC9C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,wCAAiC,EAAC,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,2BAAoB,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AA5BW,QAAA,kBAAkB,sBA4B7B"}
+{"version":3,"file":"functionHandler.js","sourceRoot":"","sources":["../../src/wrapper/functionHandler.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAwC;AAExC,8CAAuC;AACvC,oDAA2D;AAE3D,iCAGgB;AAQhB;;GAEG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,aAAa,EACb,UAAU,EACV,YAAY,GACP,EAAiB,EAAE;IACxB,IAAI,CAAC,IAAA,qBAAQ,EAAC,UAAU,CAAC,EAAE;QACzB,aAAG,CAAC,MAAM,CAAC,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACtD,OAAO;KACR;IAED,MAAM,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAEpC,IAAI,CAAC,IAAA,uBAAU,EAAC,EAAE,CAAC,EAAE;QACnB,aAAG,CAAC,MAAM,CAAC,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC,CAAC;QACxD,OAAO;KACR;IAED,aAAG,CAAC,IAAI,CACN,aAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EACtB,IAAI,IAAA,4BAAM,EAAC,EAAE,CAAC;QACZ,+CAA+C;SAC9C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,wCAAiC,EAAC,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,2BAAoB,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AA5BW,QAAA,kBAAkB,sBA4B7B"}

package/lib/wrapper/http.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,7 +13,7 @@ const logging_1 = require("../utils/logging");
  * - The request body is JSON parsed and passed into the function as parameters.
  * - The function's return value is JSON stringified into the response body.
  */
-const createRequestListenerFromFunction = (fn) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+const createRequestListenerFromFunction = (fn) => async (req, res) => {
     const writeJsonResponse = (statusCode, jsonResponse) => {
         res.writeHead(statusCode, { 'Content-Type': 'application/json' });
         return new Promise((resolve, reject) => jsonResponse === undefined
@@ -30,7 +21,7 @@ const createRequestListenerFromFunction = (fn) => (req, res) => __awaiter(void 0
             : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) => err ? reject(err) : res.end(resolve)));
     };
     try {
-        const requestBody = yield new Promise((resolve, reject) => {
+        const requestBody = await new Promise((resolve, reject) => {
             const data = [];
             req
                 .on('data', (chunk) => data.push(chunk))
@@ -43,13 +34,13 @@ const createRequestListenerFromFunction = (fn) => (req, res) => __awaiter(void 0
         const args = Array.isArray(jsonRequest)
             ? jsonRequest
             : [jsonRequest];
-        const response = yield fn(...args);
-        yield writeJsonResponse(200, response);
+        const response = await fn(...args);
+        await writeJsonResponse(200, response);
     }
     catch (err) {
-        yield writeJsonResponse(500, (0, serialize_error_1.serializeError)(err));
+        await writeJsonResponse(500, (0, serialize_error_1.serializeError)(err));
     }
-});
+};
 exports.createRequestListenerFromFunction = createRequestListenerFromFunction;
 /**
  * Create a HTTP server based on the supplied `http.RequestListener`.

package/lib/wrapper/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/wrapper/http.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/wrapper/http.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,qDAAiD;AAEjD,8CAAuC;AAEvC;;;;;GAKG;AACI,MAAM,iCAAiC,GAC5C,CACE,EAAsD,EAChC,EAAE,CAC1B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACjB,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,YAAqB,EAAE,EAAE;QACtE,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAElE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC3C,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAClB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAC/D,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CACrC,CACN,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChE,MAAM,IAAI,GAAa,EAAE,CAAC;YAE1B,GAAG;iBACA,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC/C,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACxD,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,sCAAsC;QACtC,MAAM,WAAW,GAAY,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAExE,uDAAuD;QACvD,MAAM,IAAI,GAAc,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;YAChD,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAElB,MAAM,QAAQ,GAAY,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAE5C,MAAM,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;KACxC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,iBAAiB,CAAC,GAAG,EAAE,IAAA,gCAAc,EAAC,GAAG,CAAC,CAAC,CAAC;KACnD;AACH,CAAC,CAAC;AAzCS,QAAA,iCAAiC,qCAyC1C;AAEJ;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,CAClC,eAAqC,EACrC,IAAa,EACb,EAAE;IACF,MAAM,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAElD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC3C,MAAM;SACH,MAAM,CAAC,IAAI,CAAC;SACZ,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;SACpB,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SACnB,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QACpB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAiB,CAAC;QAEhD,aAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,aAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B"}

package/lib/wrapper/main.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,7 +7,7 @@ exports.main = void 0;
 const path_1 = __importDefault(require("path"));
 const functionHandler_1 = require("./functionHandler");
 const requestListener_1 = require("./requestListener");
-const main = (rawEntryPoint, rawPort) => __awaiter(void 0, void 0, void 0, function* () {
+const main = async (rawEntryPoint, rawPort) => {
     const availablePort = Number(rawPort) || undefined;
     // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`
     const [modulePath, functionName] = path_1.default
@@ -28,6 +19,6 @@ const main = (rawEntryPoint, rawPort) => __awaiter(void 0, void 0, void 0, funct
     return functionName
         ? (0, functionHandler_1.runFunctionHandler)({ availablePort, entryPoint, functionName })
         : (0, requestListener_1.runRequestListener)({ availablePort, entryPoint });
-});
+};
 exports.main = main;
 //# sourceMappingURL=main.js.map

package/lib/wrapper/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/wrapper/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,uDAAuD;AACvD,uDAAuD;AAEhD,MAAM,IAAI,GAAG,CAAO,aAAqB,EAAE,OAAe,EAAE,EAAE;IACnE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;IAEnD,wEAAwE;IACxE,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,cAAI;SACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC;SAClC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAEjB,6BAA6B;IAC7B,8DAA8D;IAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAY,CAAC;IAElD,OAAO,YAAY;QACjB,CAAC,CAAC,IAAA,oCAAkB,EAAC,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;QACjE,CAAC,CAAC,IAAA,oCAAkB,EAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;AACxD,CAAC,CAAA,CAAC;AAfW,QAAA,IAAI,QAef"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/wrapper/main.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uDAAuD;AACvD,uDAAuD;AAEhD,MAAM,IAAI,GAAG,KAAK,EAAE,aAAqB,EAAE,OAAe,EAAE,EAAE;IACnE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;IAEnD,wEAAwE;IACxE,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,cAAI;SACpC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC;SAClC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAEjB,6BAA6B;IAC7B,8DAA8D;IAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAY,CAAC;IAElD,OAAO,YAAY;QACjB,CAAC,CAAC,IAAA,oCAAkB,EAAC,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;QACjE,CAAC,CAAC,IAAA,oCAAkB,EAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AAfW,QAAA,IAAI,QAef"}