skuba 6.0.2 → 6.2.0

package/lib/utils/copy.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var copy_exports = {};
 __export(copy_exports, {
+  copyFile: () => copyFile,
   copyFiles: () => copyFiles,
   createEjsRenderer: () => createEjsRenderer,
   createStringReplacer: () => createStringReplacer
@@ -38,7 +39,10 @@ var import_ejs = __toESM(require("ejs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_error = require("./error");
 var import_logging = require("./logging");
-const copyFile = async (sourcePath, destinationPath, { overwrite = true, processors }) => {
+const copyFile = async (sourcePath, destinationPath, {
+  overwrite = true,
+  processors
+}) => {
   const oldContents = await import_fs_extra.default.promises.readFile(sourcePath, "utf8");
   const newContents = processors.reduce(
     (contents, process) => process(contents),
@@ -93,6 +97,7 @@ const copyFiles = async (opts, currentSourceDir = opts.sourceRoot, currentDestin
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  copyFile,
   copyFiles,
   createEjsRenderer,
   createStringReplacer

package/lib/utils/copy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/copy.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (contents: string) => string;\n\nconst copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  { overwrite = true, processors }: CopyFilesOptions,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: Array<TextProcessor>;\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (contents) =>\n    ejs.render(contents, templateData);\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIpB,MAAM,WAAW,OACf,YACA,iBACA,EAAE,YAAY,MAAM,WAAW,MAC5B;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,QAAQ;AAAA,IACvC;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAP;AACA,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,aACC,WAAAC,QAAI,OAAO,UAAU,YAAY;AAE9B,MAAM,uBACX,CACE,iBAKF,CAAC,aACC,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,IAC5C;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAP;AACA,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (contents: string) => string;\n\nexport const copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  {\n    overwrite = true,\n    processors,\n  }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: Array<TextProcessor>;\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (contents) =>\n    ejs.render(contents, templateData);\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIb,MAAM,WAAW,OACtB,YACA,iBACA;AAAA,EACE,YAAY;AAAA,EACZ;AACF,MACG;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,QAAQ;AAAA,IACvC;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAP;AACA,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,aACC,WAAAC,QAAI,OAAO,UAAU,YAAY;AAE9B,MAAM,uBACX,CACE,iBAKF,CAAC,aACC,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,IAC5C;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAP;AACA,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": ["fs", "ejs", "path"]
 }

package/lib/utils/dir.d.ts

@@ -1,7 +1,8 @@
+import picomatch from 'picomatch';
 /**
  * Build a map that associates each glob pattern with its matching filepaths.
  */
-export declare const buildPatternToFilepathMap: (patterns: string[], allFilepaths: string[]) => {
+export declare const buildPatternToFilepathMap: (patterns: string[], allFilepaths: string[], options?: picomatch.PicomatchOptions) => {
     [k: string]: string[];
 };
 /**

package/lib/utils/dir.js

@@ -39,9 +39,9 @@ var import_fs_extra = __toESM(require("fs-extra"));
 var import_ignore = __toESM(require("ignore"));
 var import_picomatch = __toESM(require("picomatch"));
 var import_error = require("./error");
-const buildPatternToFilepathMap = (patterns, allFilepaths) => Object.fromEntries(
+const buildPatternToFilepathMap = (patterns, allFilepaths, options) => Object.fromEntries(
   patterns.map((pattern) => {
-    const isMatch = (0, import_picomatch.default)(pattern);
+    const isMatch = (0, import_picomatch.default)(pattern, options);
     const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));
     return [pattern, filepaths];
   })

package/lib/utils/dir.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/dir.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { fdir as FDir } from 'fdir';\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilename = '.gitignore',\n) => {\n  const ignoreFileFilter = await createInclusionFilter([\n    path.join(root, ignoreFilename),\n  ]);\n\n  const output = await new FDir()\n    .crawlWithOptions(root, {\n      exclude: (dirname) => ['.git', 'node_modules'].includes(dirname),\n      filters: [\n        (pathname) => {\n          const relativePathname = path.relative(root, pathname);\n\n          return ignoreFileFilter(relativePathname);\n        },\n      ],\n      includeBasePath: true,\n    })\n    .withPromise();\n\n  // Patch over non-specific `fdir` typings.\n  const absoluteFilenames = output as string[];\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,kBAA6B;AAC7B,sBAAe;AACf,oBAAmB;AACnB,uBAAsB;AAEtB,mBAAgC;AAKzB,MAAM,4BAA4B,CACvC,UACA,iBAEA,OAAO;AAAA,EACL,SAAS,IAAI,CAAC,YAAY;AACxB,UAAM,cAAU,iBAAAA,SAAU,OAAO;AAEjC,UAAM,YAAY,aAAa,OAAO,CAAC,aAAa,QAAQ,QAAQ,CAAC;AAErE,WAAO,CAAC,SAAS,SAAS;AAAA,EAC5B,CAAC;AACH;AAWK,MAAM,iBAAiB,OAC5B,MACA,iBAAiB,iBACd;AACH,QAAM,mBAAmB,MAAM,sBAAsB;AAAA,IACnD,YAAAC,QAAK,KAAK,MAAM,cAAc;AAAA,EAChC,CAAC;AAED,QAAM,SAAS,MAAM,IAAI,YAAAC,KAAK,EAC3B,iBAAiB,MAAM;AAAA,IACtB,SAAS,CAAC,YAAY,CAAC,QAAQ,cAAc,EAAE,SAAS,OAAO;AAAA,IAC/D,SAAS;AAAA,MACP,CAAC,aAAa;AACZ,cAAM,mBAAmB,YAAAD,QAAK,SAAS,MAAM,QAAQ;AAErD,eAAO,iBAAiB,gBAAgB;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,iBAAiB;AAAA,EACnB,CAAC,EACA,YAAY;AAGf,QAAM,oBAAoB;AAE1B,QAAM,oBAAoB,kBAAkB;AAAA,IAAI,CAAC,aAC/C,YAAAA,QAAK,SAAS,MAAM,QAAQ;AAAA,EAC9B;AAEA,SAAO;AACT;AAMO,MAAM,wBAAwB,OAAO,oBAA8B;AACxE,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,mBAAmB;AAC5C,UAAI;AACF,eAAO,MAAM,gBAAAE,QAAG,SAAS,SAAS,gBAAgB,MAAM;AAAA,MAC1D,SAAS,KAAP;AACA,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,QACF;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,YACd,OAAO,CAAC,UAA2B,OAAO,UAAU,QAAQ,EAC5D,IAAI,CAAC,cAAU,cAAAC,SAAO,EAAE,IAAI,KAAK,CAAC;AAErC,aAAO,cAAAA,SAAO,EAAE,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,aAAa;AACzD;",
+  "sourcesContent": ["import path from 'path';\n\nimport { fdir as FDir } from 'fdir';\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilename = '.gitignore',\n) => {\n  const ignoreFileFilter = await createInclusionFilter([\n    path.join(root, ignoreFilename),\n  ]);\n\n  const output = await new FDir()\n    .crawlWithOptions(root, {\n      exclude: (dirname) => ['.git', 'node_modules'].includes(dirname),\n      filters: [\n        (pathname) => {\n          const relativePathname = path.relative(root, pathname);\n\n          return ignoreFileFilter(relativePathname);\n        },\n      ],\n      includeBasePath: true,\n    })\n    .withPromise();\n\n  // Patch over non-specific `fdir` typings.\n  const absoluteFilenames = output as string[];\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,kBAA6B;AAC7B,sBAAe;AACf,oBAAmB;AACnB,uBAAsB;AAEtB,mBAAgC;AAKzB,MAAM,4BAA4B,CACvC,UACA,cACA,YAEA,OAAO;AAAA,EACL,SAAS,IAAI,CAAC,YAAY;AACxB,UAAM,cAAU,iBAAAA,SAAU,SAAS,OAAO;AAE1C,UAAM,YAAY,aAAa,OAAO,CAAC,aAAa,QAAQ,QAAQ,CAAC;AAErE,WAAO,CAAC,SAAS,SAAS;AAAA,EAC5B,CAAC;AACH;AAWK,MAAM,iBAAiB,OAC5B,MACA,iBAAiB,iBACd;AACH,QAAM,mBAAmB,MAAM,sBAAsB;AAAA,IACnD,YAAAC,QAAK,KAAK,MAAM,cAAc;AAAA,EAChC,CAAC;AAED,QAAM,SAAS,MAAM,IAAI,YAAAC,KAAK,EAC3B,iBAAiB,MAAM;AAAA,IACtB,SAAS,CAAC,YAAY,CAAC,QAAQ,cAAc,EAAE,SAAS,OAAO;AAAA,IAC/D,SAAS;AAAA,MACP,CAAC,aAAa;AACZ,cAAM,mBAAmB,YAAAD,QAAK,SAAS,MAAM,QAAQ;AAErD,eAAO,iBAAiB,gBAAgB;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,iBAAiB;AAAA,EACnB,CAAC,EACA,YAAY;AAGf,QAAM,oBAAoB;AAE1B,QAAM,oBAAoB,kBAAkB;AAAA,IAAI,CAAC,aAC/C,YAAAA,QAAK,SAAS,MAAM,QAAQ;AAAA,EAC9B;AAEA,SAAO;AACT;AAMO,MAAM,wBAAwB,OAAO,oBAA8B;AACxE,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,mBAAmB;AAC5C,UAAI;AACF,eAAO,MAAM,gBAAAE,QAAG,SAAS,SAAS,gBAAgB,MAAM;AAAA,MAC1D,SAAS,KAAP;AACA,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,QACF;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,YACd,OAAO,CAAC,UAA2B,OAAO,UAAU,QAAQ,EAC5D,IAAI,CAAC,cAAU,cAAAC,SAAO,EAAE,IAAI,KAAK,CAAC;AAErC,aAAO,cAAAA,SAAO,EAAE,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,aAAa;AACzD;",
   "names": ["picomatch", "path", "FDir", "fs", "ignore"]
 }

package/lib/utils/manifest.d.ts

@@ -6,5 +6,6 @@ export declare const ProjectType: t.Union<[t.Literal<"application">, t.Literal<"
 export declare const PROJECT_TYPES: readonly ["application", "package"];
 export declare const getSkubaManifest: () => Promise<NormalizedPackageJson>;
 export declare const getConsumerManifest: () => Promise<readPkgUp.NormalizedReadResult | undefined>;
+export declare const getPropFromConsumerManifest: <T extends string, V = unknown>(prop: T) => Promise<V | undefined>;
 export declare const getStringPropFromConsumerManifest: <T extends string>(prop: T) => Promise<string | undefined>;
 export declare const getEntryPointFromManifest: () => Promise<string>;

package/lib/utils/manifest.js

@@ -32,6 +32,7 @@ __export(manifest_exports, {
   ProjectType: () => ProjectType,
   getConsumerManifest: () => getConsumerManifest,
   getEntryPointFromManifest: () => getEntryPointFromManifest,
+  getPropFromConsumerManifest: () => getPropFromConsumerManifest,
   getSkubaManifest: () => getSkubaManifest,
   getStringPropFromConsumerManifest: () => getStringPropFromConsumerManifest
 });
@@ -57,9 +58,13 @@ const getSkubaManifest = async () => {
   return skubaManifest = result.packageJson;
 };
 const getConsumerManifest = () => (0, import_read_pkg_up.default)();
-const getStringPropFromConsumerManifest = async (prop) => {
+const getPropFromConsumerManifest = async (prop) => {
   const result = await getConsumerManifest();
-  return result !== void 0 && (0, import_validation.hasStringProp)(result.packageJson.skuba, prop) ? result.packageJson.skuba[prop] : void 0;
+  return result !== void 0 && (0, import_validation.hasProp)(result.packageJson.skuba, prop) ? result.packageJson.skuba[prop] : void 0;
+};
+const getStringPropFromConsumerManifest = async (prop) => {
+  const result = await getPropFromConsumerManifest(prop);
+  return typeof result === "string" ? result : void 0;
 };
 const getEntryPointFromManifest = async () => {
   const entryPoint = await getStringPropFromConsumerManifest("entryPoint");
@@ -71,6 +76,7 @@ const getEntryPointFromManifest = async () => {
   ProjectType,
   getConsumerManifest,
   getEntryPointFromManifest,
+  getPropFromConsumerManifest,
   getSkubaManifest,
   getStringPropFromConsumerManifest
 });

package/lib/utils/manifest.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/manifest.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport type { NormalizedPackageJson } from 'read-pkg-up';\nimport readPkgUp from 'read-pkg-up';\nimport * as t from 'runtypes';\n\nimport { hasStringProp } from './validation';\n\nexport type ProjectType = t.Static<typeof ProjectType>;\n\nexport const ProjectType = t.Union(\n  t.Literal('application'),\n  t.Literal('package'),\n);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasStringProp(result.packageJson.skuba, prop)\n    ? result.packageJson.skuba[prop]\n    : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,yBAAsB;AACtB,QAAmB;AAEnB,wBAA8B;AAIvB,MAAM,cAAc,EAAE;AAAA,EAC3B,EAAE,QAAQ,aAAa;AAAA,EACvB,EAAE,QAAQ,SAAS;AACrB;AAEO,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,iCAAc,OAAO,YAAY,OAAO,IAAI,IACvE,OAAO,YAAY,MAAM,IAAI,IAC7B;AACN;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
+  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport type { NormalizedPackageJson } from 'read-pkg-up';\nimport readPkgUp from 'read-pkg-up';\nimport * as t from 'runtypes';\n\nimport { hasProp } from './validation';\n\nexport type ProjectType = t.Static<typeof ProjectType>;\n\nexport const ProjectType = t.Union(\n  t.Literal('application'),\n  t.Literal('package'),\n);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getPropFromConsumerManifest = async <\n  T extends string,\n  V = unknown,\n>(\n  prop: T,\n): Promise<V | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasProp<T, V>(result.packageJson.skuba, prop)\n    ? result.packageJson.skuba[prop]\n    : undefined;\n};\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getPropFromConsumerManifest(prop);\n\n  return typeof result === 'string' ? result : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,yBAAsB;AACtB,QAAmB;AAEnB,wBAAwB;AAIjB,MAAM,cAAc,EAAE;AAAA,EAC3B,EAAE,QAAQ,aAAa;AAAA,EACvB,EAAE,QAAQ,SAAS;AACrB;AAEO,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,8BAA8B,OAIzC,SAC2B;AAC3B,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,2BAAc,OAAO,YAAY,OAAO,IAAI,IACvE,OAAO,YAAY,MAAM,IAAI,IAC7B;AACN;AAEO,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,4BAA4B,IAAI;AAErD,SAAO,OAAO,WAAW,WAAW,SAAS;AAC/C;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
   "names": ["readPkgUp"]
 }

package/lib/utils/validation.d.ts

@@ -1,6 +1,6 @@
 export declare const isFunction: (data: unknown) => data is (...args: unknown[]) => unknown | Promise<unknown>;
 export declare const isIpPort: (value: unknown) => value is number;
 export declare const isObject: (value: unknown) => value is Record<PropertyKey, unknown>;
-export declare const hasProp: <P extends PropertyKey>(value: unknown, prop: P) => value is Record<P, unknown>;
-export declare const hasNumberProp: <P extends PropertyKey>(value: unknown, prop: P) => value is Record<P, string>;
+export declare const hasProp: <P extends PropertyKey, V = unknown>(value: unknown, prop: P) => value is Record<P, V>;
+export declare const hasNumberProp: <P extends PropertyKey>(value: unknown, prop: P) => value is Record<P, number>;
 export declare const hasStringProp: <P extends PropertyKey>(value: unknown, prop: P) => value is Record<P, string>;

package/lib/utils/validation.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/validation.ts"],
-  "sourcesContent": ["export const isFunction = (\n  data: unknown,\n): data is (...args: unknown[]) => unknown | Promise<unknown> =>\n  typeof data === 'function';\n\nexport const isIpPort = (value: unknown): value is number =>\n  typeof value === 'number' &&\n  Number.isSafeInteger(value) &&\n  value >= 0 &&\n  value <= 65535;\n\nexport const isObject = (\n  value: unknown,\n): value is Record<PropertyKey, unknown> =>\n  typeof value === 'object' && value !== null;\n\nexport const hasProp = <P extends PropertyKey>(\n  value: unknown,\n  prop: P,\n): value is Record<P, unknown> => isObject(value) && value.hasOwnProperty(prop);\n\nexport const hasNumberProp = <P extends PropertyKey>(\n  value: unknown,\n  prop: P,\n): value is Record<P, string> =>\n  isObject(value) && typeof value[prop] === 'number';\n\nexport const hasStringProp = <P extends PropertyKey>(\n  value: unknown,\n  prop: P,\n): value is Record<P, string> =>\n  isObject(value) && typeof value[prop] === 'string';\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,aAAa,CACxB,SAEA,OAAO,SAAS;AAEX,MAAM,WAAW,CAAC,UACvB,OAAO,UAAU,YACjB,OAAO,cAAc,KAAK,KAC1B,SAAS,KACT,SAAS;AAEJ,MAAM,WAAW,CACtB,UAEA,OAAO,UAAU,YAAY,UAAU;AAElC,MAAM,UAAU,CACrB,OACA,SACgC,SAAS,KAAK,KAAK,MAAM,eAAe,IAAI;AAEvE,MAAM,gBAAgB,CAC3B,OACA,SAEA,SAAS,KAAK,KAAK,OAAO,MAAM,IAAI,MAAM;AAErC,MAAM,gBAAgB,CAC3B,OACA,SAEA,SAAS,KAAK,KAAK,OAAO,MAAM,IAAI,MAAM;",
+  "sourcesContent": ["export const isFunction = (\n  data: unknown,\n): data is (...args: unknown[]) => unknown | Promise<unknown> =>\n  typeof data === 'function';\n\nexport const isIpPort = (value: unknown): value is number =>\n  typeof value === 'number' &&\n  Number.isSafeInteger(value) &&\n  value >= 0 &&\n  value <= 65535;\n\nexport const isObject = (\n  value: unknown,\n): value is Record<PropertyKey, unknown> =>\n  typeof value === 'object' && value !== null;\n\nexport const hasProp = <P extends PropertyKey, V = unknown>(\n  value: unknown,\n  prop: P,\n): value is Record<P, V> => isObject(value) && value.hasOwnProperty(prop);\n\nexport const hasNumberProp = <P extends PropertyKey>(\n  value: unknown,\n  prop: P,\n): value is Record<P, number> =>\n  isObject(value) && typeof value[prop] === 'number';\n\nexport const hasStringProp = <P extends PropertyKey>(\n  value: unknown,\n  prop: P,\n): value is Record<P, string> =>\n  isObject(value) && typeof value[prop] === 'string';\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,aAAa,CACxB,SAEA,OAAO,SAAS;AAEX,MAAM,WAAW,CAAC,UACvB,OAAO,UAAU,YACjB,OAAO,cAAc,KAAK,KAC1B,SAAS,KACT,SAAS;AAEJ,MAAM,WAAW,CACtB,UAEA,OAAO,UAAU,YAAY,UAAU;AAElC,MAAM,UAAU,CACrB,OACA,SAC0B,SAAS,KAAK,KAAK,MAAM,eAAe,IAAI;AAEjE,MAAM,gBAAgB,CAC3B,OACA,SAEA,SAAS,KAAK,KAAK,OAAO,MAAM,IAAI,MAAM;AAErC,MAAM,gBAAgB,CAC3B,OACA,SAEA,SAAS,KAAK,KAAK,OAAO,MAAM,IAAI,MAAM;",
   "names": []
 }

package/lib/wrapper/requestListener.js

@@ -50,6 +50,9 @@ const runRequestListener = async ({
     return;
   }
   const port = (0, import_validation.isIpPort)(config.port) ? config.port : availablePort;
+  if (typeof config !== "function" && config instanceof import_http.default.Server) {
+    return (0, import_http2.startServer)(config, port);
+  }
   if (typeof config !== "function" && config.server && config.server instanceof import_http.default.Server) {
     return (0, import_http2.startServer)(config.server, port);
   }

package/lib/wrapper/requestListener.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/requestListener.ts"],
-  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } 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  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<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: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await 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 port = isIpPort(config.port) ? config.port : availablePort;\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\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  return serveRequestListener(requestListener, port);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,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,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAC,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
+  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } 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  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<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: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await 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 port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\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  return serveRequestListener(requestListener, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,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,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
   "names": ["import_http", "http"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "6.0.2",
+  "version": "6.2.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -71,19 +71,19 @@
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
     "@jest/types": "^29.0.0",
     "@octokit/graphql": "^5.0.0",
-    "@octokit/graphql-schema": "^13.0.0",
-    "@octokit/rest": "^19.0.0",
+    "@octokit/graphql-schema": "^14.5.0",
+    "@octokit/rest": "^19.0.8",
     "@octokit/types": "^9.0.0",
     "@types/jest": "^29.0.0",
     "@types/node": ">=16.11",
     "chalk": "^4.1.0",
-    "concurrently": "^7.0.0",
+    "concurrently": "^8.0.0",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.17.0",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.4.1",
+    "eslint-config-skuba": "2.0.2",
     "execa": "^5.0.0",
     "fdir": "^6.0.0",
     "fs-extra": "^11.0.0",
@@ -111,7 +111,7 @@
     "sort-package-json": "^1.57.0",
     "strip-ansi": "^6.0.1",
     "ts-dedent": "^2.2.0",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.7.0",
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
@@ -120,13 +120,13 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.26.0",
+    "@changesets/cli": "2.26.1",
     "@changesets/get-github-info": "0.5.2",
-    "@jest/reporters": "29.4.3",
+    "@jest/reporters": "29.5.0",
     "@types/ejs": "3.1.2",
     "@types/express": "4.17.17",
     "@types/fs-extra": "11.0.1",
-    "@types/koa": "2.13.5",
+    "@types/koa": "2.13.6",
     "@types/libnpmsearch": "2.0.3",
     "@types/lodash.mergewith": "4.6.7",
     "@types/module-alias": "2.0.1",
@@ -134,15 +134,15 @@
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
     "@types/validate-npm-package-name": "4.0.0",
-    "enhanced-resolve": "5.12.0",
+    "enhanced-resolve": "5.13.0",
     "express": "4.18.2",
-    "fastify": "4.13.0",
+    "fastify": "4.17.0",
     "jsonfile": "6.1.0",
-    "koa": "2.14.1",
-    "memfs": "3.4.13",
+    "koa": "2.14.2",
+    "memfs": "3.5.1",
     "remark-cli": "11.0.0",
     "remark-preset-lint-recommended": "6.1.2",
-    "semver": "7.3.8",
+    "semver": "7.5.0",
     "supertest": "6.3.3",
     "type-fest": "2.19.0"
   },

package/template/base/.github/CODEOWNERS

@@ -1,5 +1 @@
 * @<%- ownerName %>
-
-# Configured by Renovate
-package.json
-yarn.lock

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

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

package/template/express-rest-api/gantry.apply.yml

@@ -108,8 +108,6 @@ cpu: 256
 memory: 512
 
 deployment:
-  # SEEK-Jobs/gantry#488
-  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

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

@@ -12,7 +12,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^5.0.1",
+    "@seek/logger": "^6.0.0",
     "express": "^4.17.1",
     "skuba-dive": "^2.0.0"
   },

package/template/express-rest-api/src/api/healthCheck.ts

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Signifies that the API is available to serve requests.

package/template/express-rest-api/src/api/smokeTest.ts

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

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

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

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

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

package/template/koa-rest-api/gantry.apply.yml

@@ -115,8 +115,6 @@ cpu: 256
 memory: 512
 
 deployment:
-  # SEEK-Jobs/gantry#488
-  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

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

@@ -14,11 +14,11 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.36.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.39.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.34.0",
-    "@opentelemetry/instrumentation-http": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.36.0",
-    "@seek/logger": "^5.0.1",
+    "@opentelemetry/instrumentation-http": "^0.39.0",
+    "@opentelemetry/sdk-node": "^0.39.0",
+    "@seek/logger": "^6.0.0",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",

package/template/koa-rest-api/src/api/healthCheck.ts

@@ -1,4 +1,4 @@
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Signifies that the API is available to serve requests.

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

@@ -1,7 +1,7 @@
 import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import * as storage from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const getJobsHandler: Middleware = async (ctx) => {
   const jobs = await storage.readJobs();

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

@@ -3,7 +3,7 @@ import { metricsClient } from 'src/framework/metrics';
 import { validateRequestBody } from 'src/framework/validation';
 import * as storage from 'src/storage/jobs';
 import { JobInputSchema } from 'src/types/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const postJobHandler: Middleware = async (ctx) => {
   const jobInput = validateRequestBody(ctx, JobInputSchema);

package/template/koa-rest-api/src/api/smokeTest.ts

@@ -1,5 +1,5 @@
 import { smokeTestJobStorage } from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

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

@@ -4,7 +4,7 @@ import { logger } from 'src/testing/logging';
 import { metricsClient } from 'src/testing/metrics';
 import { agentFromRouter } from 'src/testing/server';
 import { chance } from 'src/testing/types';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 const middleware = jest.fn<void, Parameters<Middleware>>();
 

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

@@ -1,7 +1,7 @@
 import { ErrorMiddleware } from 'seek-koala';
-import { z } from 'zod';
+import type { z } from 'zod';
 
-import { Context } from 'src/types/koa';
+import type { Context } from 'src/types/koa';
 
 /**
  * Converts a `ZodError` into an `invalidFields` object

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

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 
-import { Job, JobInput } from 'src/types/jobs';
+import type { Job, JobInput } from 'src/types/jobs';
 
 const jobStore: Record<string, Job> = {};
 

package/template/koa-rest-api/src/testing/server.ts

@@ -1,5 +1,5 @@
-import Router from '@koa/router';
-import Koa from 'koa';
+import type Router from '@koa/router';
+import type Koa from 'koa';
 import request from 'supertest';
 
 import { createApp } from 'src/framework/server';

package/template/koa-rest-api/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import { z } from 'zod';
 
-import { JobInput } from 'src/types/jobs';
+import type { JobInput } from 'src/types/jobs';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

package/template/lambda-sqs-worker/.buildkite/pipeline.yml

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.11.0:
+        - docker-compose#v4.12.0:
             dependencies: false
             run: app
       retry:
@@ -60,7 +60,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10
 

package/template/lambda-sqs-worker/package.json

@@ -18,9 +18,9 @@
     "@aws-sdk/client-lambda": "^3.259.0",
     "@aws-sdk/client-sns": "^3.259.0",
     "@aws-sdk/util-utf8-node": "^3.259.0",
-    "@seek/logger": "^5.0.1",
-    "datadog-lambda-js": "^6.83.0",
-    "dd-trace": "^3.8.0",
+    "@seek/logger": "^6.0.0",
+    "datadog-lambda-js": "^7.0.0",
+    "dd-trace": "^4.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },

package/template/lambda-sqs-worker/src/app.ts

@@ -1,6 +1,6 @@
 import 'skuba-dive/register';
 
-import { SQSEvent } from 'aws-lambda';
+import type { SQSEvent } from 'aws-lambda';
 
 import { createHandler } from 'src/framework/handler';
 import { logger } from 'src/framework/logging';

package/template/lambda-sqs-worker/src/framework/validation.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import type { z } from 'zod';
 
 export const validateJson = <
   Output,

package/template/lambda-sqs-worker/src/mapping/jobScorer.ts

@@ -1,5 +1,8 @@
-import { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
-import { JobPublishedEvent, JobScoredEvent } from 'src/types/pipelineEvents';
+import type { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
+import type {
+  JobPublishedEvent,
+  JobScoredEvent,
+} from 'src/types/pipelineEvents';
 
 export const jobPublishedEventToScorerInput = (
   record: JobPublishedEvent,

package/template/lambda-sqs-worker/src/services/jobScorer.ts

@@ -2,12 +2,12 @@ import {
   jobPublishedEventToScorerInput,
   jobScorerOutputToScoredEvent,
 } from 'src/mapping/jobScorer';
-import {
-  JobScorerInput,
-  JobScorerOutput,
-  JobScorerOutputSchema,
-} from 'src/types/jobScorer';
-import { JobPublishedEvent, JobScoredEvent } from 'src/types/pipelineEvents';
+import type { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
+import { JobScorerOutputSchema } from 'src/types/jobScorer';
+import type {
+  JobPublishedEvent,
+  JobScoredEvent,
+} from 'src/types/pipelineEvents';
 
 /* istanbul ignore next: simulation of an external service */
 export const scoringService = {

package/template/lambda-sqs-worker/src/testing/handler.ts

@@ -1,4 +1,4 @@
-import { Context, SQSEvent } from 'aws-lambda';
+import type { Context, SQSEvent } from 'aws-lambda';
 
 import { chance } from './types';
 

package/template/lambda-sqs-worker/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import { z } from 'zod';
 
-import { JobPublishedEvent } from 'src/types/pipelineEvents';
+import type { JobPublishedEvent } from 'src/types/pipelineEvents';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.11.0:
+        - docker-compose#v4.12.0:
             dependencies: false
             run: app
       retry:
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10