skuba 4.4.0 → 5.0.0-beta.0

package/lib/wrapper/http.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/wrapper/http.ts"],"names":[],"mappings":"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"}
+{
+  "version": 3,
+  "sources": ["../../src/wrapper/http.ts"],
+  "sourcesContent": ["import http from 'http';\nimport type { AddressInfo } from 'net';\n\nimport { serializeError } from 'serialize-error';\n\nimport { log } from '../utils/logging';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n  (\n    fn: (...args: unknown[]) => unknown | Promise<unknown>,\n  ): http.RequestListener =>\n  async (req, res) => {\n    const writeJsonResponse = (statusCode: number, jsonResponse: unknown) => {\n      res.writeHead(statusCode, { 'Content-Type': 'application/json' });\n\n      return new Promise<void>((resolve, reject) =>\n        jsonResponse === undefined\n          ? res.end(resolve)\n          : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\n      );\n    };\n\n    try {\n      const requestBody = await new Promise<string>((resolve, reject) => {\n        const data: Buffer[] = [];\n\n        req\n          .on('data', (chunk: Buffer) => data.push(chunk))\n          .on('end', () => resolve(Buffer.concat(data).toString()))\n          .on('error', (err) => reject(err));\n      });\n\n      // Treat an empty body as no arguments\n      const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n      // Pass a non-array request body as the first parameter\n      const args: unknown[] = Array.isArray(jsonRequest)\n        ? jsonRequest\n        : [jsonRequest];\n\n      const response: unknown = await fn(...args);\n\n      await writeJsonResponse(200, response);\n    } catch (err) {\n      await writeJsonResponse(500, serializeError(err));\n    }\n  };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n  requestListener: http.RequestListener,\n  port?: number,\n) => {\n  const server = http.createServer(requestListener);\n\n  return new Promise<void>((resolve, reject) =>\n    server\n      .listen(port)\n      .on('close', resolve)\n      .on('error', reject)\n      .on('listening', () => {\n        const address = server.address() as AddressInfo;\n\n        log.ok('listening on port', log.bold(address.port));\n      }),\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CACE,OAEF,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAP;AACA,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,QAAK,aAAa,eAAe;AAEhD,SAAO,IAAI;AAAA,IAAc,CAAC,SAAS,WACjC,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,YAAM,UAAU,OAAO,QAAQ;AAE/B,yBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,IACpD,CAAC;AAAA,EACL;AACF;",
+  "names": ["http"]
+}

package/lib/wrapper/index.js

@@ -1,28 +1,16 @@
 "use strict";
-/**
- * Wrapper around an entry point provided to `skuba node` or `skuba start`.
- *
- * Beyond simply loading the entry point, it supports the following features:
- *
- * - If you set the entry point to an exported function like `src/app#handler`,
- *   it will spin up a local HTTP server that calls into the function.
- *
- * - If you `export =` or `export default` an Express or Koa application,
- *   it will spin up a local HTTP server based on the request listener.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const error_1 = require("../utils/error");
-const logging_1 = require("../utils/logging");
-const main_1 = require("./main");
-const ENTRY_POINT_VAR = '__SKUBA_ENTRY_POINT';
-const PORT_VAR = '__SKUBA_PORT';
+var import_error = require("../utils/error");
+var import_logging = require("../utils/logging");
+var import_main = require("./main");
+const ENTRY_POINT_VAR = "__SKUBA_ENTRY_POINT";
+const PORT_VAR = "__SKUBA_PORT";
 const rawEntryPoint = process.env[ENTRY_POINT_VAR];
 if (!rawEntryPoint) {
-    throw new Error(`Missing environment variable: ${logging_1.log.bold(ENTRY_POINT_VAR)}`);
+  throw new Error(`Missing environment variable: ${import_logging.log.bold(ENTRY_POINT_VAR)}`);
 }
 const rawPort = process.env[PORT_VAR];
 if (!rawPort) {
-    throw new Error(`Missing environment variable: ${logging_1.log.bold(PORT_VAR)}`);
+  throw new Error(`Missing environment variable: ${import_logging.log.bold(PORT_VAR)}`);
 }
-(0, main_1.main)(rawEntryPoint, rawPort).catch(error_1.handleCliError);
-//# sourceMappingURL=index.js.map
+(0, import_main.main)(rawEntryPoint, rawPort).catch(import_error.handleCliError);
+//# sourceMappingURL=index.js.map

package/lib/wrapper/index.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/wrapper/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;AAEH,0CAAgD;AAChD,8CAAuC;AAEvC,iCAA8B;AAE9B,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACnD,IAAI,CAAC,aAAa,EAAE;IAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,aAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;CAC/E;AAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACtC,IAAI,CAAC,OAAO,EAAE;IACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,aAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CACxE;AAED,IAAA,WAAI,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,sBAAc,CAAC,CAAC"}
+{
+  "version": 3,
+  "sources": ["../../src/wrapper/index.ts"],
+  "sourcesContent": ["/**\n * Wrapper around an entry point provided to `skuba node` or `skuba start`.\n *\n * Beyond simply loading the entry point, it supports the following features:\n *\n * - If you set the entry point to an exported function like `src/app#handler`,\n *   it will spin up a local HTTP server that calls into the function.\n *\n * - If you `export =` or `export default` an Express or Koa application,\n *   it will spin up a local HTTP server based on the request listener.\n */\n\nimport { handleCliError } from '../utils/error';\nimport { log } from '../utils/logging';\n\nimport { main } from './main';\n\nconst ENTRY_POINT_VAR = '__SKUBA_ENTRY_POINT';\nconst PORT_VAR = '__SKUBA_PORT';\n\nconst rawEntryPoint = process.env[ENTRY_POINT_VAR];\nif (!rawEntryPoint) {\n  throw new Error(`Missing environment variable: ${log.bold(ENTRY_POINT_VAR)}`);\n}\n\nconst rawPort = process.env[PORT_VAR];\nif (!rawPort) {\n  throw new Error(`Missing environment variable: ${log.bold(PORT_VAR)}`);\n}\n\nmain(rawEntryPoint, rawPort).catch(handleCliError);\n"],
+  "mappings": ";AAYA,mBAA+B;AAC/B,qBAAoB;AAEpB,kBAAqB;AAErB,MAAM,kBAAkB;AACxB,MAAM,WAAW;AAEjB,MAAM,gBAAgB,QAAQ,IAAI;AAClC,IAAI,CAAC,eAAe;AAClB,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,eAAe,GAAG;AAC9E;AAEA,MAAM,UAAU,QAAQ,IAAI;AAC5B,IAAI,CAAC,SAAS;AACZ,QAAM,IAAI,MAAM,iCAAiC,mBAAI,KAAK,QAAQ,GAAG;AACvE;AAAA,IAEA,kBAAK,eAAe,OAAO,EAAE,MAAM,2BAAc;",
+  "names": []
+}

package/lib/wrapper/main.js

@@ -1,24 +1,43 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
-const path_1 = __importDefault(require("path"));
-const functionHandler_1 = require("./functionHandler");
-const requestListener_1 = require("./requestListener");
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var main_exports = {};
+__export(main_exports, {
+  main: () => main
+});
+module.exports = __toCommonJS(main_exports);
+var import_path = __toESM(require("path"));
+var import_functionHandler = require("./functionHandler");
+var import_requestListener = require("./requestListener");
 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
-        .join(process.cwd(), rawEntryPoint)
-        .split('#', 2);
-    // Load entry point as module
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const entryPoint = require(modulePath);
-    return functionName
-        ? (0, functionHandler_1.runFunctionHandler)({ availablePort, entryPoint, functionName })
-        : (0, requestListener_1.runRequestListener)({ availablePort, entryPoint });
+  const availablePort = Number(rawPort) || void 0;
+  const [modulePath, functionName] = import_path.default.join(process.cwd(), rawEntryPoint).split("#", 2);
+  const entryPoint = require(modulePath);
+  return functionName ? (0, import_functionHandler.runFunctionHandler)({ availablePort, entryPoint, functionName }) : (0, import_requestListener.runRequestListener)({ availablePort, entryPoint });
 };
-exports.main = main;
-//# sourceMappingURL=main.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  main
+});
+//# sourceMappingURL=main.js.map

package/lib/wrapper/main.js.map

@@ -1 +1,7 @@
-{"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"}
+{
+  "version": 3,
+  "sources": ["../../src/wrapper/main.ts"],
+  "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n  const availablePort = Number(rawPort) || undefined;\n\n  // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n  const [modulePath, functionName] = path\n    .join(process.cwd(), rawEntryPoint)\n    .split('#', 2);\n\n  // Load entry point as module\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const entryPoint = require(modulePath) as unknown;\n\n  return functionName\n    ? runFunctionHandler({ availablePort, entryPoint, functionName })\n    : runRequestListener({ availablePort, entryPoint });\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAU;AAErC,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
+  "names": ["path"]
+}

package/lib/wrapper/requestListener.js

@@ -1,37 +1,52 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runRequestListener = void 0;
-const validation_1 = require("../utils/validation");
-const http_1 = require("./http");
-const isConfig = (data) => (0, validation_1.isFunction)(data) || (0, validation_1.isObject)(data);
-/**
- * Create an HTTP server that calls into an exported `http.RequestListener`.
- *
- * This supports Express and Koa applications out of the box.
- */
-const runRequestListener = async ({ availablePort, entryPoint, }) => {
-    if (!isConfig(entryPoint)) {
-        // Assume an executable script with weird exports
-        return;
-    }
-    let config = entryPoint;
-    if (typeof config === 'object' && isConfig(config.default)) {
-        // Prefer `export default` over `export =`
-        config = config.default;
-    }
-    if (Object.keys(config).length === 0) {
-        // Assume an executable script with no exports
-        return;
-    }
-    const requestListener = typeof config === 'function'
-        ? config
-        : config.requestListener ?? config.callback?.();
-    if (typeof requestListener !== 'function') {
-        // Assume an executable script with non-request listener exports
-        return;
-    }
-    const port = (0, validation_1.isIpPort)(config.port) ? config.port : availablePort;
-    return (0, http_1.serveRequestListener)(requestListener, port);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-exports.runRequestListener = runRequestListener;
-//# sourceMappingURL=requestListener.js.map
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var requestListener_exports = {};
+__export(requestListener_exports, {
+  runRequestListener: () => runRequestListener
+});
+module.exports = __toCommonJS(requestListener_exports);
+var import_validation = require("../utils/validation");
+var import_http = require("./http");
+const isConfig = (data) => (0, import_validation.isFunction)(data) || (0, import_validation.isObject)(data);
+const runRequestListener = async ({
+  availablePort,
+  entryPoint
+}) => {
+  if (!isConfig(entryPoint)) {
+    return;
+  }
+  let config = entryPoint;
+  if (typeof config === "object" && isConfig(config.default)) {
+    config = config.default;
+  }
+  if (Object.keys(config).length === 0) {
+    return;
+  }
+  const requestListener = typeof config === "function" ? config : config.requestListener ?? config.callback?.();
+  if (typeof requestListener !== "function") {
+    return;
+  }
+  const port = (0, import_validation.isIpPort)(config.port) ? config.port : availablePort;
+  return (0, import_http.serveRequestListener)(requestListener, port);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runRequestListener
+});
+//# sourceMappingURL=requestListener.js.map

package/lib/wrapper/requestListener.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"requestListener.js","sourceRoot":"","sources":["../../src/wrapper/requestListener.ts"],"names":[],"mappings":";;;AAEA,oDAAqE;AAErE,iCAA8C;AAiB9C,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAyC,EAAE,CACxE,IAAA,uBAAU,EAAC,IAAI,CAAC,IAAI,IAAA,qBAAQ,EAAC,IAAI,CAAC,CAAC;AAOrC;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,aAAa,EACb,UAAU,GACL,EAAiB,EAAE;IACxB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACzB,iDAAiD;QACjD,OAAO;KACR;IAED,IAAI,MAAM,GAAG,UAAU,CAAC;IAExB,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC1D,0CAA0C;QAC1C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;KACzB;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,8CAA8C;QAC9C,OAAO;KACR;IAED,MAAM,eAAe,GACnB,OAAO,MAAM,KAAK,UAAU;QAC1B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAEpD,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACzC,gEAAgE;QAChE,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,qBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;IAEjE,OAAO,IAAA,2BAAoB,EAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}
+{
+  "version": 3,
+  "sources": ["../../src/wrapper/requestListener.ts"],
+  "sourcesContent": ["import type http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  default?: unknown;\n  port?: unknown;\n}\n\nconst isConfig = (data: unknown): data is FunctionConfig | ObjectConfig =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config = entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : config.requestListener ?? config.callback?.();\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  return serveRequestListener(requestListener, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wBAA+C;AAE/C,kBAAqC;AAiBrC,MAAM,WAAW,CAAC,aAChB,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAS;AAEb,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,OAAO;AAAA,EAClB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAEnD,aAAO,kCAAqB,iBAAiB,IAAI;AACnD;",
+  "names": []
+}

package/package.json

@@ -6,11 +6,12 @@
     "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
+    "@esbuild-plugins/tsconfig-paths": "^0.0.4",
     "@jest/types": "^29.0.0",
     "@octokit/graphql": "^5.0.0",
     "@octokit/graphql-schema": "^12.0.0",
     "@octokit/rest": "^19.0.0",
-    "@octokit/types": "^7.0.0",
+    "@octokit/types": "^8.0.0",
     "@types/jest": "^29.0.0",
     "@types/node": ">=14.18",
     "chalk": "^4.1.0",
@@ -18,6 +19,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
+    "esbuild": "~0.15.7",
     "eslint": "^8.11.0",
     "eslint-config-skuba": "1.1.4",
     "execa": "^5.0.0",
@@ -30,11 +32,12 @@
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
     "jest-watch-typeahead": "^2.1.1",
+    "libnpmsearch": "^6.0.0",
     "lodash.mergewith": "^4.6.2",
-    "normalize-package-data": "^4.0.0",
+    "minimist": "^1.2.6",
+    "normalize-package-data": "^5.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
-    "package-json": "^7.0.0",
     "picomatch": "^2.2.2",
     "prettier": "~2.7.0",
     "read-pkg-up": "^7.0.1",
@@ -45,37 +48,40 @@
     "sort-package-json": "^1.57.0",
     "strip-ansi": "^6.0.1",
     "ts-dedent": "^2.2.0",
-    "ts-jest": "^29.0.0-next.0",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.7.0",
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.8.2"
+    "typescript": "~4.8.2",
+    "validate-npm-package-name": "^5.0.0"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
-    "@changesets/cli": "2.24.3",
+    "@changesets/cli": "2.25.0",
     "@changesets/get-github-info": "0.5.1",
-    "@jest/reporters": "29.0.1",
+    "@jest/reporters": "29.2.1",
     "@types/ejs": "3.1.1",
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "@types/fs-extra": "9.0.13",
     "@types/koa": "2.13.5",
+    "@types/libnpmsearch": "2.0.3",
     "@types/lodash.mergewith": "4.6.7",
     "@types/module-alias": "2.0.1",
     "@types/npm-which": "3.0.1",
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
+    "@types/validate-npm-package-name": "4.0.0",
     "enhanced-resolve": "5.10.0",
-    "express": "4.18.1",
+    "express": "4.18.2",
     "jsonfile": "6.1.0",
     "koa": "2.13.4",
     "memfs": "3.4.7",
     "remark-cli": "11.0.0",
     "remark-preset-lint-recommended": "6.1.2",
-    "semver": "7.3.7",
-    "supertest": "6.2.4",
-    "type-fest": "2.18.0"
+    "semver": "7.3.8",
+    "supertest": "6.3.0",
+    "type-fest": "2.19.0"
   },
   "engines": {
     "node": ">=14.18"
@@ -132,7 +138,7 @@
     "**/@types/node": ">=14.18"
   },
   "scripts": {
-    "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
+    "build": "scripts/build.sh",
     "deploy": "scripts/deploy.sh",
     "format": "yarn skuba format",
     "lint": "yarn skuba lint && yarn lint:md",
@@ -148,11 +154,12 @@
   },
   "sideEffects": false,
   "skuba": {
+    "build": "esbuild",
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.4.0"
+  "version": "5.0.0-beta.0"
 }

package/template/base/jest.config.ts

@@ -10,12 +10,6 @@ export default Jest.mergePreset({
       statements: 0,
     },
   },
-  globals: {
-    'ts-jest': {
-      // seek-oss/skuba#626
-      isolatedModules: true,
-    },
-  },
   setupFiles: ['<rootDir>/jest.setup.ts'],
   testPathIgnorePatterns: ['/test\\.ts'],
 });

package/template/base/jest.setup.ts

@@ -1 +1,3 @@
 process.env.ENVIRONMENT = 'test';
+
+export {};

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.10.0:
+      - docker-compose#v4.5.0:
           run: app
     timeout_in_minutes: 10
 

package/template/express-rest-api/package.json

@@ -6,7 +6,7 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^16.0.0",
+    "@types/node": "16.11.64",
     "@types/supertest": "^2.0.11",
     "pino-pretty": "^9.0.0",
     "skuba": "*",

package/template/greeter/.buildkite/pipeline.yml

@@ -32,6 +32,6 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.10.0:
+      - docker-compose#v4.5.0:
           run: app
     timeout_in_minutes: 10

package/template/greeter/package.json

@@ -3,7 +3,7 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "16.11.64",
     "skuba": "*"
   },
   "engines": {

package/template/greeter/src/app.test.ts

@@ -1,3 +1,5 @@
+import * as app from './app';
+
 describe('app', () => {
-  it('is importable', () => expect(import('./app')).resolves.toEqual({}));
+  it('is importable', () => expect(app).toEqual({}));
 });

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.10.0:
+      - docker-compose#v4.5.0:
           run: app
     timeout_in_minutes: 10
 

package/template/koa-rest-api/package.json

@@ -3,30 +3,27 @@
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.8.0",
-    "@opentelemetry/instrumentation-http": "^0.32.0",
-    "@opentelemetry/sdk-node": "^0.32.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.9.0",
+    "@opentelemetry/instrumentation-http": "^0.33.0",
+    "@opentelemetry/sdk-node": "^0.33.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.2.0",
-    "runtypes": "^6.4.1",
-    "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
     "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
-    "uuid": "^8.3.2"
+    "zod": "^3.19.1"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^5.0.2",
-    "@types/koa__router": "^8.0.8",
-    "@types/node": "^16.0.0",
+    "@types/koa__router": "^12.0.0",
+    "@types/node": "16.11.64",
     "@types/supertest": "^2.0.11",
-    "@types/uuid": "^8.3.1",
     "chance": "^1.1.8",
     "pino-pretty": "^9.0.0",
     "skuba": "*",

package/template/koa-rest-api/src/api/jobs/postJob.test.ts

@@ -26,13 +26,9 @@ describe('postJobHandler', () => {
       .send(jobInput)
       .expect(422)
       .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(`
-          "Validation failed:
-          {
-            "hirer": "Expected { id: string; }, but was missing"
-          }.
-          Object should match { hirer: { id: string; }; }"
-        `),
+        expect(text).toMatchInlineSnapshot(
+          `"{"message":"Input validation failed","invalidFields":{"/hirer":"Required"}}"`,
+        ),
       );
   });
 });

package/template/koa-rest-api/src/api/jobs/postJob.ts

@@ -2,11 +2,11 @@ import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import { validateRequestBody } from 'src/framework/validation';
 import * as storage from 'src/storage/jobs';
-import { filterJobInput } from 'src/types/jobs';
+import { JobInputSchema } from 'src/types/jobs';
 import { Middleware } from 'src/types/koa';
 
 export const postJobHandler: Middleware = async (ctx) => {
-  const jobInput = validateRequestBody(ctx, filterJobInput);
+  const jobInput = validateRequestBody(ctx, JobInputSchema);
 
   const job = await storage.createJob(jobInput);
 

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -1,7 +1,7 @@
 import { agentFromMiddleware } from 'src/testing/server';
 import {
+  IdDescriptionSchema,
   chance,
-  filterIdDescription,
   mockIdDescription,
 } from 'src/testing/types';
 
@@ -12,7 +12,7 @@ const agent = agentFromMiddleware(jsonBodyParser, (ctx) => {
   const result = validate({
     ctx,
     input: ctx.request.body,
-    filter: filterIdDescription,
+    schema: IdDescriptionSchema,
   });
 
   ctx.body = result;
@@ -41,13 +41,14 @@ describe('validate', () => {
       .post('/')
       .send({ ...idDescription, id: null })
       .expect(422)
-      .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(`
-          "Validation failed:
+      .expect(({ body }) =>
+        expect(body).toMatchInlineSnapshot(`
           {
-            "id": "Expected string, but was null"
-          }.
-          Object should match { id: string; description: string; }"
+            "invalidFields": {
+              "/id": "Expected string, received null",
+            },
+            "message": "Input validation failed",
+          }
         `),
       );
   });
@@ -57,14 +58,15 @@ describe('validate', () => {
       .post('/')
       .send({})
       .expect(422)
-      .expect(({ text }) =>
-        expect(text).toMatchInlineSnapshot(`
-          "Validation failed:
+      .expect(({ body }) =>
+        expect(body).toMatchInlineSnapshot(`
           {
-            "id": "Expected string, but was missing",
-            "description": "Expected string, but was missing"
-          }.
-          Object should match { id: string; description: string; }"
+            "invalidFields": {
+              "/description": "Required",
+              "/id": "Required",
+            },
+            "message": "Input validation failed",
+          }
         `),
       ));
 });