skuba 9.2.0-wat-20250115035523 → 10.0.0-main-20250312042528

package/lib/cli/migrate/nodeVersion/getNodeTypesVersion.js

@@ -0,0 +1,58 @@
+"use strict";
+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 });
+};
+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 getNodeTypesVersion_exports = {};
+__export(getNodeTypesVersion_exports, {
+  getNodeTypesVersion: () => getNodeTypesVersion
+});
+module.exports = __toCommonJS(getNodeTypesVersion_exports);
+var import_util = require("util");
+var import_semver = require("semver");
+var import_logging = require("../../../utils/logging");
+var import_version = require("../../../utils/version");
+const getNodeTypesVersion = async (major, defaultVersion) => {
+  try {
+    const versions = await (0, import_version.getNpmVersions)("@types/node");
+    const matchingVersions = Object.values(versions ?? {}).filter(
+      (v) => (0, import_semver.valid)(v.version) && (0, import_semver.satisfies)(v.version, `${major}.x.x`) && !v.deprecated
+    );
+    if (!matchingVersions.length) {
+      return {
+        version: defaultVersion,
+        err: `No matching @types/node versions for Node.js ${major}`
+      };
+    }
+    const { version } = matchingVersions.reduce(
+      (a, b) => (0, import_semver.gt)(a.version, b.version) ? a : b
+    );
+    return {
+      version
+    };
+  } catch (err) {
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return {
+      version: defaultVersion,
+      err: `Failed to fetch latest @types/node version, using fallback version ${defaultVersion}`
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getNodeTypesVersion
+});
+//# sourceMappingURL=getNodeTypesVersion.js.map

package/lib/cli/migrate/nodeVersion/getNodeTypesVersion.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/migrate/nodeVersion/getNodeTypesVersion.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { gt, satisfies, valid } from 'semver';\n\nimport { log } from '../../../utils/logging';\nimport { getNpmVersions } from '../../../utils/version';\n\ntype VersionResult = {\n  version: string;\n  err?: string;\n};\n\nexport const getNodeTypesVersion = async (\n  major: number,\n  defaultVersion: string,\n): Promise<VersionResult> => {\n  try {\n    const versions = await getNpmVersions('@types/node');\n\n    const matchingVersions = Object.values(versions ?? {}).filter(\n      (v) =>\n        valid(v.version) &&\n        satisfies(v.version, `${major}.x.x`) &&\n        !v.deprecated,\n    );\n\n    if (!matchingVersions.length) {\n      return {\n        version: defaultVersion,\n        err: `No matching @types/node versions for Node.js ${major}`,\n      };\n    }\n\n    const { version } = matchingVersions.reduce((a, b) =>\n      gt(a.version, b.version) ? a : b,\n    );\n\n    return {\n      version,\n    };\n  } catch (err) {\n    log.subtle(inspect(err));\n    return {\n      version: defaultVersion,\n      err: `Failed to fetch latest @types/node version, using fallback version ${defaultVersion}`,\n    };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,oBAAqC;AAErC,qBAAoB;AACpB,qBAA+B;AAOxB,MAAM,sBAAsB,OACjC,OACA,mBAC2B;AAC3B,MAAI;AACF,UAAM,WAAW,UAAM,+BAAe,aAAa;AAEnD,UAAM,mBAAmB,OAAO,OAAO,YAAY,CAAC,CAAC,EAAE;AAAA,MACrD,CAAC,UACC,qBAAM,EAAE,OAAO,SACf,yBAAU,EAAE,SAAS,GAAG,KAAK,MAAM,KACnC,CAAC,EAAE;AAAA,IACP;AAEA,QAAI,CAAC,iBAAiB,QAAQ;AAC5B,aAAO;AAAA,QACL,SAAS;AAAA,QACT,KAAK,gDAAgD,KAAK;AAAA,MAC5D;AAAA,IACF;AAEA,UAAM,EAAE,QAAQ,IAAI,iBAAiB;AAAA,MAAO,CAAC,GAAG,UAC9C,kBAAG,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI;AAAA,IACjC;AAEA,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF,SAAS,KAAK;AACZ,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK,sEAAsE,cAAc;AAAA,IAC3F;AAAA,EACF;AACF;",
+  "names": []
+}

package/lib/cli/migrate/nodeVersion/index.d.ts

@@ -1 +1,5 @@
-export declare const nodeVersionMigration: (version: number, dir?: string) => Promise<void>;
+export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, defaultNodeTypesVersion, }: {
+    nodeVersion: number;
+    ECMAScriptVersion: string;
+    defaultNodeTypesVersion: string;
+}, dir?: string) => Promise<void>;

package/lib/cli/migrate/nodeVersion/index.js

@@ -36,70 +36,153 @@ var import_fast_glob = require("fast-glob");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_logging = require("../../../utils/logging");
 var import_project = require("../../configure/analysis/project");
-const subPatches = [
-  { file: ".nvmrc", replace: "<%- version %>\n" },
+var import_checks = require("./checks");
+var import_getNodeTypesVersion = require("./getNodeTypesVersion");
+const subPatches = ({
+  nodeVersion,
+  nodeTypesVersion,
+  ECMAScriptVersion
+}) => [
+  { file: ".nvmrc", replace: `${nodeVersion}
+` },
   {
-    files: "Dockerfile*",
-    test: /^FROM(.*) node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
-    replace: "FROM$1 node:<%- version %>$3$4"
+    files: "**/Dockerfile*",
+    regex: /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,
+    replace: `FROM$1 $2node:${nodeVersion}$4$6`
   },
   {
-    files: "Dockerfile*",
-    test: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(.+)$/gm,
-    replace: "FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2"
+    files: "**/Dockerfile*",
+    regex: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
+    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`
   },
   {
-    files: "serverless*.y*ml",
-    test: /nodejs\d+.x/gm,
-    replace: "nodejs<%- version %>.x"
+    files: "**/serverless*.y*ml",
+    regex: /\bnodejs\d+.x\b/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `nodejs${nodeVersion}.x`
   },
   {
-    files: "infra/**/*.ts",
-    test: /NODEJS_\d+_X/g,
-    replace: "NODEJS_<%- version %>_X"
+    files: "**/serverless*.y*ml",
+    regex: /\bnode\d+\b/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `node${nodeVersion}`
   },
   {
-    files: ".buildkite/*",
-    test: /image: node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
-    replace: "image: node:<%- version %>$2"
+    files: "**/infra/**/*.ts",
+    regex: /NODEJS_\d+_X/g,
+    replace: `NODEJS_${nodeVersion}_X`
+  },
+  {
+    files: "**/infra/**/*.ts",
+    regex: /(target:\s*'node)(\d+)(.+)$/gm,
+    replace: `$1${nodeVersion}$3`
+  },
+  {
+    files: "**/.buildkite/*",
+    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: `$1$2$3${nodeVersion}$5`
+  },
+  {
+    files: ".node-version*",
+    regex: /(\d+(?:\.\d+)*)/g,
+    replace: `${nodeVersion}`
+  },
+  {
+    files: "**/package.json",
+    regex: /("@types\/node":\s*")(\^)?(\d+\.\d+\.\d+)(")/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `$1$2${nodeTypesVersion}$4`
+  },
+  {
+    files: "**/package.json",
+    regex: /(["']engines["']:\s*{[\s\S]*?["']node["']:\s*["']>=)(\d+(?:\.\d+)*)(['"]\s*})/gm,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1${nodeVersion}$3`
+  },
+  {
+    files: "**/tsconfig*.json",
+    regex: /("target":\s*")(ES\d+)"/gim,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1${ECMAScriptVersion}"`
+  },
+  {
+    files: "**/tsconfig*.json",
+    regex: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1$2${ECMAScriptVersion}$4$5`
+  },
+  {
+    files: "**/docker-compose*.y*ml",
+    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: `$1$2$3${nodeVersion}$5`
   }
 ];
-const runSubPatch = async (version, dir, patch) => {
+const runSubPatch = async (dir, patch) => {
   const readFile = (0, import_project.createDestinationFileReader)(dir);
   const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], { cwd: dir });
   await Promise.all(
     paths.map(async (path) => {
+      if (path.includes("node_modules")) {
+        return;
+      }
       const contents = await readFile(path);
       if (!contents) {
         return;
       }
-      if (patch.test && !patch.test.test(contents)) {
+      if (patch.regex && !patch.regex.test(contents)) {
         return;
       }
-      const templated = patch.replace.replaceAll(
-        "<%- version %>",
-        version.toString()
-      );
-      await import_fs_extra.default.promises.writeFile(
+      if (patch.tests) {
+        const results = await Promise.all(patch.tests.map((test) => test()));
+        if (!results.every(Boolean)) {
+          return;
+        }
+      }
+      await writePatchedContents({
         path,
-        patch.test ? contents.replaceAll(patch.test, templated) : templated
-      );
+        contents,
+        templated: patch.replace,
+        regex: patch.regex
+      });
     })
   );
 };
-const upgrade = async (version, dir) => {
-  await Promise.all(
-    subPatches.map((subPatch) => runSubPatch(version, dir, subPatch))
-  );
+const writePatchedContents = async ({
+  path,
+  contents,
+  templated,
+  regex
+}) => await import_fs_extra.default.promises.writeFile(
+  path,
+  regex ? contents.replaceAll(regex, templated) : templated
+);
+const upgrade = async (versions, dir) => {
+  for (const subPatch of subPatches(versions)) {
+    await runSubPatch(dir, subPatch);
+  }
 };
-const nodeVersionMigration = async (version, dir = process.cwd()) => {
-  import_logging.log.ok(`Upgrading to Node.js ${version}`);
+const nodeVersionMigration = async ({
+  nodeVersion,
+  ECMAScriptVersion,
+  defaultNodeTypesVersion
+}, dir = process.cwd()) => {
+  import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
   try {
-    await upgrade(version, dir);
-    import_logging.log.ok("Upgraded to Node.js", version);
-  } catch (err) {
+    if (!await (0, import_checks.isPatchableNodeVersion)(nodeVersion)) {
+      throw new Error("Node.js version is not patchable");
+    }
+    const { version: nodeTypesVersion, err } = await (0, import_getNodeTypesVersion.getNodeTypesVersion)(
+      nodeVersion,
+      defaultNodeTypesVersion
+    );
+    if (err) {
+      import_logging.log.warn(err);
+    }
+    await upgrade({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir);
+    import_logging.log.ok("Upgraded to Node.js", nodeVersion);
+  } catch (error) {
     import_logging.log.err("Failed to upgrade");
-    import_logging.log.subtle((0, import_util.inspect)(err));
+    import_logging.log.subtle((0, import_util.inspect)(error));
     process.exitCode = 1;
   }
 };

package/lib/cli/migrate/nodeVersion/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/index.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\n\ntype SubPatch = (\n  | { files: string; file?: never }\n  | { file: string; files?: never }\n) & {\n  test?: RegExp;\n  replace: string;\n};\n\nconst subPatches: SubPatch[] = [\n  { file: '.nvmrc', replace: '<%- version %>\\n' },\n  {\n    files: 'Dockerfile*',\n    test: /^FROM(.*) node:[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: 'FROM$1 node:<%- version %>$3$4',\n  },\n  {\n    files: 'Dockerfile*',\n    test: /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(.+)$/gm,\n    replace: 'FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2',\n  },\n  {\n    files: 'serverless*.y*ml',\n    test: /nodejs\\d+.x/gm,\n    replace: 'nodejs<%- version %>.x',\n  },\n  {\n    files: 'infra/**/*.ts',\n    test: /NODEJS_\\d+_X/g,\n    replace: 'NODEJS_<%- version %>_X',\n  },\n  {\n    files: '.buildkite/*',\n    test: /image: node:[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: 'image: node:<%- version %>$2',\n  },\n];\n\nconst runSubPatch = async (version: number, dir: string, patch: SubPatch) => {\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.test && !patch.test.test(contents)) {\n        return;\n      }\n\n      const templated = patch.replace.replaceAll(\n        '<%- version %>',\n        version.toString(),\n      );\n\n      await fs.promises.writeFile(\n        path,\n        patch.test ? contents.replaceAll(patch.test, templated) : templated,\n      );\n    }),\n  );\n};\n\nconst upgrade = async (version: number, dir: string) => {\n  await Promise.all(\n    subPatches.map((subPatch) => runSubPatch(version, dir, subPatch)),\n  );\n};\n\nexport const nodeVersionMigration = async (\n  version: number,\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${version}`);\n  try {\n    await upgrade(version, dir);\n    log.ok('Upgraded to Node.js', version);\n  } catch (err) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(err));\n    process.exitCode = 1;\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAAe;AAEf,qBAAoB;AACpB,qBAA4C;AAU5C,MAAM,aAAyB;AAAA,EAC7B,EAAE,MAAM,UAAU,SAAS,mBAAmB;AAAA,EAC9C;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AACF;AAEA,MAAM,cAAc,OAAO,SAAiB,KAAa,UAAoB;AAC3E,QAAM,eAAW,4CAA4B,GAAG;AAChD,QAAM,QAAQ,MAAM,OAChB,CAAC,MAAM,IAAI,IACX,UAAM,uBAAK,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC;AAE9C,QAAM,QAAQ;AAAA,IACZ,MAAM,IAAI,OAAO,SAAS;AACxB,YAAM,WAAW,MAAM,SAAS,IAAI;AACpC,UAAI,CAAC,UAAU;AACb;AAAA,MACF;AAEA,UAAI,MAAM,QAAQ,CAAC,MAAM,KAAK,KAAK,QAAQ,GAAG;AAC5C;AAAA,MACF;AAEA,YAAM,YAAY,MAAM,QAAQ;AAAA,QAC9B;AAAA,QACA,QAAQ,SAAS;AAAA,MACnB;AAEA,YAAM,gBAAAA,QAAG,SAAS;AAAA,QAChB;AAAA,QACA,MAAM,OAAO,SAAS,WAAW,MAAM,MAAM,SAAS,IAAI;AAAA,MAC5D;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEA,MAAM,UAAU,OAAO,SAAiB,QAAgB;AACtD,QAAM,QAAQ;AAAA,IACZ,WAAW,IAAI,CAAC,aAAa,YAAY,SAAS,KAAK,QAAQ,CAAC;AAAA,EAClE;AACF;AAEO,MAAM,uBAAuB,OAClC,SACA,MAAM,QAAQ,IAAI,MACf;AACH,qBAAI,GAAG,wBAAwB,OAAO,EAAE;AACxC,MAAI;AACF,UAAM,QAAQ,SAAS,GAAG;AAC1B,uBAAI,GAAG,uBAAuB,OAAO;AAAA,EACvC,SAAS,KAAK;AACZ,uBAAI,IAAI,mBAAmB;AAC3B,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,YAAQ,WAAW;AAAA,EACrB;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\n\nimport {\n  isPatchableNodeVersion,\n  isPatchableServerlessVersion,\n  isPatchableSkubaType,\n} from './checks';\nimport { getNodeTypesVersion } from './getNodeTypesVersion';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype SubPatch = FileSelector & {\n  tests?: Array<() => Promise<boolean>>;\n  regex?: RegExp;\n  replace: string;\n};\n\nconst subPatches = ({\n  nodeVersion,\n  nodeTypesVersion,\n  ECMAScriptVersion,\n}: Versions): SubPatch[] => [\n  { file: '.nvmrc', replace: `${nodeVersion}\\n` },\n  {\n    files: '**/Dockerfile*',\n\n    regex:\n      /^FROM(.*) (public.ecr.aws\\/docker\\/library\\/)?node:([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,\n    replace: `FROM$1 $2node:${nodeVersion}$4$6`,\n  },\n  {\n    files: '**/Dockerfile*',\n    regex:\n      /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(\\d+)(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`,\n  },\n\n  {\n    files: '**/serverless*.y*ml',\n    regex: /\\bnodejs\\d+.x\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `nodejs${nodeVersion}.x`,\n  },\n  {\n    files: '**/serverless*.y*ml',\n    regex: /\\bnode\\d+\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `node${nodeVersion}`,\n  },\n\n  {\n    files: '**/infra/**/*.ts',\n    regex: /NODEJS_\\d+_X/g,\n    replace: `NODEJS_${nodeVersion}_X`,\n  },\n  {\n    files: '**/infra/**/*.ts',\n    regex: /(target:\\s*'node)(\\d+)(.+)$/gm,\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/.buildkite/*',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n  {\n    files: '.node-version*',\n    regex: /(\\d+(?:\\.\\d+)*)/g,\n    replace: `${nodeVersion}`,\n  },\n\n  {\n    files: '**/package.json',\n    regex: /(\"@types\\/node\":\\s*\")(\\^)?(\\d+\\.\\d+\\.\\d+)(\")/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `$1$2${nodeTypesVersion}$4`,\n  },\n  {\n    files: '**/package.json',\n    regex:\n      /([\"']engines[\"']:\\s*{[\\s\\S]*?[\"']node[\"']:\\s*[\"']>=)(\\d+(?:\\.\\d+)*)(['\"]\\s*})/gm,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/tsconfig*.json',\n    regex: /(\"target\":\\s*\")(ES\\d+)\"/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${ECMAScriptVersion}\"`,\n  },\n  {\n    files: '**/tsconfig*.json',\n    regex: /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1$2${ECMAScriptVersion}$4$5`,\n  },\n\n  {\n    files: '**/docker-compose*.y*ml',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n];\n\ntype Versions = {\n  nodeVersion: number;\n  nodeTypesVersion: string;\n  ECMAScriptVersion: string;\n};\n\nconst runSubPatch = async (dir: string, patch: SubPatch) => {\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      if (path.includes('node_modules')) {\n        return;\n      }\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.regex && !patch.regex.test(contents)) {\n        return;\n      }\n\n      if (patch.tests) {\n        const results = await Promise.all(patch.tests.map((test) => test()));\n        if (!results.every(Boolean)) {\n          return;\n        }\n      }\n\n      await writePatchedContents({\n        path,\n        contents,\n        templated: patch.replace,\n        regex: patch.regex,\n      });\n    }),\n  );\n};\n\nconst writePatchedContents = async ({\n  path,\n  contents,\n  templated,\n  regex,\n}: {\n  path: string;\n  contents: string;\n  templated: string;\n  regex?: RegExp;\n}) =>\n  await fs.promises.writeFile(\n    path,\n    regex ? contents.replaceAll(regex, templated) : templated,\n  );\n\nconst upgrade = async (versions: Versions, dir: string) => {\n  for (const subPatch of subPatches(versions)) {\n    await runSubPatch(dir, subPatch);\n  }\n};\n\nexport const nodeVersionMigration = async (\n  {\n    nodeVersion,\n    ECMAScriptVersion,\n    defaultNodeTypesVersion,\n  }: {\n    nodeVersion: number;\n    ECMAScriptVersion: string;\n    defaultNodeTypesVersion: string;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    if (!(await isPatchableNodeVersion(nodeVersion))) {\n      throw new Error('Node.js version is not patchable');\n    }\n\n    const { version: nodeTypesVersion, err } = await getNodeTypesVersion(\n      nodeVersion,\n      defaultNodeTypesVersion,\n    );\n    if (err) {\n      log.warn(err);\n    }\n    await upgrade({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir);\n    log.ok('Upgraded to Node.js', nodeVersion);\n  } catch (error) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(error));\n    process.exitCode = 1;\n  }\n};\n"],
+  "mappings": "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",
   "names": ["fs"]
 }

package/lib/index.js

@@ -26,15 +26,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Buildkite: () => Buildkite,
   Git: () => Git,
   GitHub: () => GitHub,
   Jest: () => Jest,
   Net: () => Net
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var Buildkite = __toESM(require("./api/buildkite"));
 var Git = __toESM(require("./api/git"));
 var GitHub = __toESM(require("./api/github"));

package/lib/utils/copy.d.ts

@@ -1,4 +1,4 @@
-export type TextProcessor = (contents: string) => string;
+export type TextProcessor = (sourcePath: string, contents: string) => string;
 export declare const copyFile: (sourcePath: string, destinationPath: string, { overwrite, processors, }: Pick<CopyFilesOptions, "overwrite" | "processors">) => Promise<void>;
 interface CopyFilesOptions {
     sourceRoot: string;

package/lib/utils/copy.js

@@ -45,7 +45,7 @@ const copyFile = async (sourcePath, destinationPath, {
 }) => {
   const oldContents = await import_fs_extra.default.promises.readFile(sourcePath, "utf8");
   const newContents = processors.reduce(
-    (contents, process) => process(contents),
+    (contents, process) => process(sourcePath, contents),
     oldContents
   );
   if (oldContents === newContents && sourcePath === destinationPath) {
@@ -62,8 +62,16 @@ const copyFile = async (sourcePath, destinationPath, {
     throw err;
   }
 };
-const createEjsRenderer = (templateData) => (contents) => import_ejs.default.render(contents, templateData);
-const createStringReplacer = (replacements) => (contents) => replacements.reduce(
+const createEjsRenderer = (templateData) => (sourcePath, contents) => {
+  try {
+    return import_ejs.default.render(contents, templateData, { strict: false });
+  } catch (err) {
+    import_logging.log.err("Failed to render", import_logging.log.bold(sourcePath));
+    import_logging.log.subtle(err);
+    return contents;
+  }
+};
+const createStringReplacer = (replacements) => (_sourcePath, contents) => replacements.reduce(
   (newContents, { input, output }) => newContents.replace(input, output),
   contents
 );

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\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: 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            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\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,KAAK;AACZ,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,EACzC,QAAQ,wBAAwB,kBAAkB,IACrD;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,KAAK;AACZ,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 = (sourcePath: string, 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(sourcePath, 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: TextProcessor[];\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (sourcePath: string, contents) => {\n    try {\n      return ejs.render(contents, templateData, { strict: false });\n    } catch (err) {\n      log.err('Failed to render', log.bold(sourcePath));\n      log.subtle(err);\n      return contents;\n    }\n  };\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (_sourcePath: string, 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            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\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,YAAY,QAAQ;AAAA,IACnD;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,KAAK;AACZ,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,YAAoB,aAAa;AAChC,MAAI;AACF,WAAO,WAAAC,QAAI,OAAO,UAAU,cAAc,EAAE,QAAQ,MAAM,CAAC;AAAA,EAC7D,SAAS,KAAK;AACZ,uBAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAChD,uBAAI,OAAO,GAAG;AACd,WAAO;AAAA,EACT;AACF;AAEK,MAAM,uBACX,CACE,iBAKF,CAAC,aAAqB,aACpB,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,EACzC,QAAQ,wBAAwB,kBAAkB,IACrD;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,KAAK;AACZ,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/template.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
+export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
 export type TemplateName = (typeof TEMPLATE_NAMES)[number];
-export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
+export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
 interface TemplateDocumentationConfig {
     /**
      * The semantic version in which the template was first added.

package/lib/utils/template.js

@@ -48,7 +48,6 @@ const TEMPLATE_NAMES = [
   "express-rest-api",
   "greeter",
   "koa-rest-api",
-  "lambda-sqs-worker",
   "lambda-sqs-worker-cdk",
   "oss-npm-package",
   "private-npm-package"
@@ -67,10 +66,6 @@ const TEMPLATE_DOCUMENTATION_CONFIG = {
     added: "3.4.1",
     filename: "api.md"
   },
-  "lambda-sqs-worker": {
-    added: "3.4.1",
-    filename: "worker.md"
-  },
   "lambda-sqs-worker-cdk": {
     added: "3.13.0",
     filename: "worker.md"

package/lib/utils/template.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/template.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { z } from 'zod';\n\nimport { projectTypeSchema } from './manifest';\nimport { packageManagerSchema } from './packageManager';\n\nexport const TEMPLATE_NAMES = [\n  'express-rest-api',\n  'greeter',\n  'koa-rest-api',\n  'lambda-sqs-worker',\n  'lambda-sqs-worker-cdk',\n  'oss-npm-package',\n  'private-npm-package',\n] as const;\n\nexport type TemplateName = (typeof TEMPLATE_NAMES)[number];\n\nexport const TEMPLATE_NAMES_WITH_BYO = [...TEMPLATE_NAMES, 'github \u2192'] as const;\n\ninterface TemplateDocumentationConfig {\n  /**\n   * The semantic version in which the template was first added.\n   *\n   * This is used to filter out historical changelogs.\n   */\n  added: string;\n\n  /**\n   * The Markdown file for the template in our `/docs`.\n   *\n   * This is used to compile per-template changelogs for our documentation site.\n   */\n  filename: string;\n}\n\nexport const TEMPLATE_DOCUMENTATION_CONFIG: Record<\n  TemplateName,\n  TemplateDocumentationConfig\n> = {\n  'express-rest-api': {\n    added: '3.8.0',\n    filename: 'api.md',\n  },\n  greeter: {\n    added: '3.4.1',\n    filename: 'barebones.md',\n  },\n  'koa-rest-api': {\n    added: '3.4.1',\n    filename: 'api.md',\n  },\n  'lambda-sqs-worker': {\n    added: '3.4.1',\n    filename: 'worker.md',\n  },\n  'lambda-sqs-worker-cdk': {\n    added: '3.13.0',\n    filename: 'worker.md',\n  },\n  'oss-npm-package': {\n    added: '3.7.0',\n    filename: 'package.md',\n  },\n  'private-npm-package': {\n    added: '3.6.0',\n    filename: 'package.md',\n  },\n};\n\nexport type TemplateConfig = z.infer<typeof templateConfigSchema>;\n\nexport const templateConfigSchema = z.object({\n  fields: z.array(\n    z.object({\n      name: z.string(),\n      message: z.string(),\n      initial: z.string(),\n      validate: z\n        .function()\n        .args(z.string())\n        .returns(z.union([z.boolean(), z.string()]))\n        .optional(),\n    }),\n  ),\n  entryPoint: z.string().optional(),\n  noSkip: z.boolean().optional(),\n  packageManager: packageManagerSchema,\n  type: projectTypeSchema.optional(),\n});\n\nexport const TEMPLATE_CONFIG_FILENAME = 'skuba.template.js';\n\nexport const TEMPLATE_DIR = path.join(__dirname, '..', '..', 'template');\n\nexport const BASE_TEMPLATE_DIR = path.join(TEMPLATE_DIR, 'base');\n\nexport const ensureTemplateConfigDeletion = (dir: string): Promise<void> =>\n  fs.promises.rm(path.join(dir, TEMPLATE_CONFIG_FILENAME));\n\nexport const readBaseTemplateFile = (src: string): Promise<string> =>\n  fs.promises.readFile(path.join(BASE_TEMPLATE_DIR, src), 'utf8');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,iBAAkB;AAElB,sBAAkC;AAClC,4BAAqC;AAE9B,MAAM,iBAAiB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,MAAM,0BAA0B,CAAC,GAAG,gBAAgB,eAAU;AAkB9D,MAAM,gCAGT;AAAA,EACF,oBAAoB;AAAA,IAClB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,SAAS;AAAA,IACP,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,gBAAgB;AAAA,IACd,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,qBAAqB;AAAA,IACnB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,yBAAyB;AAAA,IACvB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,mBAAmB;AAAA,IACjB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,uBAAuB;AAAA,IACrB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AACF;AAIO,MAAM,uBAAuB,aAAE,OAAO;AAAA,EAC3C,QAAQ,aAAE;AAAA,IACR,aAAE,OAAO;AAAA,MACP,MAAM,aAAE,OAAO;AAAA,MACf,SAAS,aAAE,OAAO;AAAA,MAClB,SAAS,aAAE,OAAO;AAAA,MAClB,UAAU,aACP,SAAS,EACT,KAAK,aAAE,OAAO,CAAC,EACf,QAAQ,aAAE,MAAM,CAAC,aAAE,QAAQ,GAAG,aAAE,OAAO,CAAC,CAAC,CAAC,EAC1C,SAAS;AAAA,IACd,CAAC;AAAA,EACH;AAAA,EACA,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAChC,QAAQ,aAAE,QAAQ,EAAE,SAAS;AAAA,EAC7B,gBAAgB;AAAA,EAChB,MAAM,kCAAkB,SAAS;AACnC,CAAC;AAEM,MAAM,2BAA2B;AAEjC,MAAM,eAAe,YAAAA,QAAK,KAAK,WAAW,MAAM,MAAM,UAAU;AAEhE,MAAM,oBAAoB,YAAAA,QAAK,KAAK,cAAc,MAAM;AAExD,MAAM,+BAA+B,CAAC,QAC3C,gBAAAC,QAAG,SAAS,GAAG,YAAAD,QAAK,KAAK,KAAK,wBAAwB,CAAC;AAElD,MAAM,uBAAuB,CAAC,QACnC,gBAAAC,QAAG,SAAS,SAAS,YAAAD,QAAK,KAAK,mBAAmB,GAAG,GAAG,MAAM;",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { z } from 'zod';\n\nimport { projectTypeSchema } from './manifest';\nimport { packageManagerSchema } from './packageManager';\n\nexport const TEMPLATE_NAMES = [\n  'express-rest-api',\n  'greeter',\n  'koa-rest-api',\n  'lambda-sqs-worker-cdk',\n  'oss-npm-package',\n  'private-npm-package',\n] as const;\n\nexport type TemplateName = (typeof TEMPLATE_NAMES)[number];\n\nexport const TEMPLATE_NAMES_WITH_BYO = [...TEMPLATE_NAMES, 'github \u2192'] as const;\n\ninterface TemplateDocumentationConfig {\n  /**\n   * The semantic version in which the template was first added.\n   *\n   * This is used to filter out historical changelogs.\n   */\n  added: string;\n\n  /**\n   * The Markdown file for the template in our `/docs`.\n   *\n   * This is used to compile per-template changelogs for our documentation site.\n   */\n  filename: string;\n}\n\nexport const TEMPLATE_DOCUMENTATION_CONFIG: Record<\n  TemplateName,\n  TemplateDocumentationConfig\n> = {\n  'express-rest-api': {\n    added: '3.8.0',\n    filename: 'api.md',\n  },\n  greeter: {\n    added: '3.4.1',\n    filename: 'barebones.md',\n  },\n  'koa-rest-api': {\n    added: '3.4.1',\n    filename: 'api.md',\n  },\n  'lambda-sqs-worker-cdk': {\n    added: '3.13.0',\n    filename: 'worker.md',\n  },\n  'oss-npm-package': {\n    added: '3.7.0',\n    filename: 'package.md',\n  },\n  'private-npm-package': {\n    added: '3.6.0',\n    filename: 'package.md',\n  },\n};\n\nexport type TemplateConfig = z.infer<typeof templateConfigSchema>;\n\nexport const templateConfigSchema = z.object({\n  fields: z.array(\n    z.object({\n      name: z.string(),\n      message: z.string(),\n      initial: z.string(),\n      validate: z\n        .function()\n        .args(z.string())\n        .returns(z.union([z.boolean(), z.string()]))\n        .optional(),\n    }),\n  ),\n  entryPoint: z.string().optional(),\n  noSkip: z.boolean().optional(),\n  packageManager: packageManagerSchema,\n  type: projectTypeSchema.optional(),\n});\n\nexport const TEMPLATE_CONFIG_FILENAME = 'skuba.template.js';\n\nexport const TEMPLATE_DIR = path.join(__dirname, '..', '..', 'template');\n\nexport const BASE_TEMPLATE_DIR = path.join(TEMPLATE_DIR, 'base');\n\nexport const ensureTemplateConfigDeletion = (dir: string): Promise<void> =>\n  fs.promises.rm(path.join(dir, TEMPLATE_CONFIG_FILENAME));\n\nexport const readBaseTemplateFile = (src: string): Promise<string> =>\n  fs.promises.readFile(path.join(BASE_TEMPLATE_DIR, src), 'utf8');\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,iBAAkB;AAElB,sBAAkC;AAClC,4BAAqC;AAE9B,MAAM,iBAAiB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,MAAM,0BAA0B,CAAC,GAAG,gBAAgB,eAAU;AAkB9D,MAAM,gCAGT;AAAA,EACF,oBAAoB;AAAA,IAClB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,SAAS;AAAA,IACP,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,gBAAgB;AAAA,IACd,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,yBAAyB;AAAA,IACvB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,mBAAmB;AAAA,IACjB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,uBAAuB;AAAA,IACrB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AACF;AAIO,MAAM,uBAAuB,aAAE,OAAO;AAAA,EAC3C,QAAQ,aAAE;AAAA,IACR,aAAE,OAAO;AAAA,MACP,MAAM,aAAE,OAAO;AAAA,MACf,SAAS,aAAE,OAAO;AAAA,MAClB,SAAS,aAAE,OAAO;AAAA,MAClB,UAAU,aACP,SAAS,EACT,KAAK,aAAE,OAAO,CAAC,EACf,QAAQ,aAAE,MAAM,CAAC,aAAE,QAAQ,GAAG,aAAE,OAAO,CAAC,CAAC,CAAC,EAC1C,SAAS;AAAA,IACd,CAAC;AAAA,EACH;AAAA,EACA,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAChC,QAAQ,aAAE,QAAQ,EAAE,SAAS;AAAA,EAC7B,gBAAgB;AAAA,EAChB,MAAM,kCAAkB,SAAS;AACnC,CAAC;AAEM,MAAM,2BAA2B;AAEjC,MAAM,eAAe,YAAAA,QAAK,KAAK,WAAW,MAAM,MAAM,UAAU;AAEhE,MAAM,oBAAoB,YAAAA,QAAK,KAAK,cAAc,MAAM;AAExD,MAAM,+BAA+B,CAAC,QAC3C,gBAAAC,QAAG,SAAS,GAAG,YAAAD,QAAK,KAAK,KAAK,wBAAwB,CAAC;AAElD,MAAM,uBAAuB,CAAC,QACnC,gBAAAC,QAAG,SAAS,SAAS,YAAAD,QAAK,KAAK,mBAAmB,GAAG,GAAG,MAAM;",
   "names": ["path", "fs"]
 }

package/lib/utils/version.d.ts

@@ -1,4 +1,20 @@
-export declare const latestNpmVersion: (packageName: string) => Promise<string>;
+import { z } from 'zod';
+declare const NpmVersions: z.ZodRecord<z.ZodString, z.ZodObject<{
+    name: z.ZodString;
+    version: z.ZodString;
+    deprecated: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    version: string;
+    deprecated?: string | undefined;
+}, {
+    name: string;
+    version: string;
+    deprecated?: string | undefined;
+}>>;
+export type NpmVersions = z.infer<typeof NpmVersions>;
+export declare const getNpmVersions: (packageName: string) => Promise<NpmVersions | null>;
+export declare const getLatestNpmVersion: (packageName: string) => Promise<string | null>;
 export declare const getSkubaVersion: () => Promise<string>;
 type SkubaVersionInfo = {
     isStale: true;

package/lib/utils/version.js

@@ -28,31 +28,60 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var version_exports = {};
 __export(version_exports, {
+  getLatestNpmVersion: () => getLatestNpmVersion,
+  getNpmVersions: () => getNpmVersions,
   getSkubaVersion: () => getSkubaVersion,
-  getSkubaVersionInfo: () => getSkubaVersionInfo,
-  latestNpmVersion: () => latestNpmVersion
+  getSkubaVersionInfo: () => getSkubaVersionInfo
 });
 module.exports = __toCommonJS(version_exports);
-var import_libnpmsearch = __toESM(require("libnpmsearch"));
-var import_validate_npm_package_name = __toESM(require("validate-npm-package-name"));
+var import_npm_registry_fetch = __toESM(require("npm-registry-fetch"));
+var import_zod = require("zod");
 var import_manifest = require("./manifest");
 var import_wait = require("./wait");
-const latestNpmVersion = async (packageName) => {
-  const { validForNewPackages } = (0, import_validate_npm_package_name.default)(packageName);
-  if (!validForNewPackages) {
-    throw new Error(`Package "${packageName}" does not have a valid name`);
-  }
-  const [result] = await (0, import_libnpmsearch.default)(packageName, { limit: 1, timeout: 5e3 });
-  if (result?.name !== packageName) {
-    throw new Error(
-      `Package "${packageName}" does not exist on the npm registry`
-    );
+const NpmVersions = import_zod.z.record(
+  import_zod.z.string(),
+  import_zod.z.object({
+    name: import_zod.z.string(),
+    version: import_zod.z.string(),
+    deprecated: import_zod.z.string().optional()
+  })
+);
+const PackageResponse = import_zod.z.object({
+  "dist-tags": import_zod.z.record(import_zod.z.string(), import_zod.z.string()).optional(),
+  versions: NpmVersions
+});
+const getNpmPackage = async (packageName) => {
+  try {
+    const response = await import_npm_registry_fetch.default.json(packageName, {
+      headers: {
+        Accept: "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"
+      }
+    });
+    const parsedResponse = PackageResponse.safeParse(response);
+    if (!parsedResponse.success) {
+      throw new Error(
+        `Failed to parse package response from npm for package ${packageName}`
+      );
+    }
+    return parsedResponse.data;
+  } catch (error) {
+    if (error instanceof Error && "statusCode" in error && error.statusCode === 404) {
+      return null;
+    }
+    throw error;
   }
-  return result.version;
+};
+const getNpmVersions = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.versions ?? null;
+};
+const getLatestNpmVersion = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.["dist-tags"]?.latest ?? null;
 };
 const latestSkubaVersion = async () => {
   try {
-    const result = await (0, import_wait.withTimeout)(latestNpmVersion("skuba"), { s: 2 });
+    const result = await (0, import_wait.withTimeout)(getLatestNpmVersion("skuba"), { s: 2 });
     return result.ok ? result.value : null;
   } catch {
     return null;
@@ -82,8 +111,9 @@ const getSkubaVersionInfo = async () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getLatestNpmVersion,
+  getNpmVersions,
   getSkubaVersion,
-  getSkubaVersionInfo,
-  latestNpmVersion
+  getSkubaVersionInfo
 });
 //# sourceMappingURL=version.js.map

package/lib/utils/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/version.ts"],
-  "sourcesContent": ["import searchNpm from 'libnpmsearch';\nimport validatePackageName from 'validate-npm-package-name';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nexport const latestNpmVersion = async (\n  packageName: string,\n): Promise<string> => {\n  const { validForNewPackages } = validatePackageName(packageName);\n\n  if (!validForNewPackages) {\n    throw new Error(`Package \"${packageName}\" does not have a valid name`);\n  }\n\n  const [result] = await searchNpm(packageName, { limit: 1, timeout: 5_000 });\n\n  if (result?.name !== packageName) {\n    throw new Error(\n      `Package \"${packageName}\" does not exist on the npm registry`,\n    );\n  }\n\n  return result.version;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(latestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAsB;AACtB,uCAAgC;AAEhC,sBAAiC;AACjC,kBAA4B;AAErB,MAAM,mBAAmB,OAC9B,gBACoB;AACpB,QAAM,EAAE,oBAAoB,QAAI,iCAAAA,SAAoB,WAAW;AAE/D,MAAI,CAAC,qBAAqB;AACxB,UAAM,IAAI,MAAM,YAAY,WAAW,8BAA8B;AAAA,EACvE;AAEA,QAAM,CAAC,MAAM,IAAI,UAAM,oBAAAC,SAAU,aAAa,EAAE,OAAO,GAAG,SAAS,IAAM,CAAC;AAE1E,MAAI,QAAQ,SAAS,aAAa;AAChC,UAAM,IAAI;AAAA,MACR,YAAY,WAAW;AAAA,IACzB;AAAA,EACF;AAEA,SAAO,OAAO;AAChB;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,iBAAiB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
-  "names": ["validatePackageName", "searchNpm"]
+  "sourcesContent": ["import npmFetch from 'npm-registry-fetch';\nimport { z } from 'zod';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nconst NpmVersions = z.record(\n  z.string(),\n  z.object({\n    name: z.string(),\n    version: z.string(),\n    deprecated: z.string().optional(),\n  }),\n);\n\nexport type NpmVersions = z.infer<typeof NpmVersions>;\n\nconst PackageResponse = z.object({\n  'dist-tags': z.record(z.string(), z.string()).optional(),\n  versions: NpmVersions,\n});\n\nconst getNpmPackage = async (packageName: string) => {\n  try {\n    const response = await npmFetch.json(packageName, {\n      headers: {\n        Accept:\n          'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',\n      },\n    });\n\n    const parsedResponse = PackageResponse.safeParse(response);\n    if (!parsedResponse.success) {\n      throw new Error(\n        `Failed to parse package response from npm for package ${packageName}`,\n      );\n    }\n\n    return parsedResponse.data;\n  } catch (error) {\n    if (\n      error instanceof Error &&\n      'statusCode' in error &&\n      error.statusCode === 404\n    ) {\n      return null;\n    }\n    throw error;\n  }\n};\n\nexport const getNpmVersions = async (\n  packageName: string,\n): Promise<NpmVersions | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.versions ?? null;\n};\n\nexport const getLatestNpmVersion = async (\n  packageName: string,\n): Promise<string | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.['dist-tags']?.latest ?? null;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(getLatestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AACrB,iBAAkB;AAElB,sBAAiC;AACjC,kBAA4B;AAE5B,MAAM,cAAc,aAAE;AAAA,EACpB,aAAE,OAAO;AAAA,EACT,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,OAAO;AAAA,IACf,SAAS,aAAE,OAAO;AAAA,IAClB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAClC,CAAC;AACH;AAIA,MAAM,kBAAkB,aAAE,OAAO;AAAA,EAC/B,aAAa,aAAE,OAAO,aAAE,OAAO,GAAG,aAAE,OAAO,CAAC,EAAE,SAAS;AAAA,EACvD,UAAU;AACZ,CAAC;AAED,MAAM,gBAAgB,OAAO,gBAAwB;AACnD,MAAI;AACF,UAAM,WAAW,MAAM,0BAAAA,QAAS,KAAK,aAAa;AAAA,MAChD,SAAS;AAAA,QACP,QACE;AAAA,MACJ;AAAA,IACF,CAAC;AAED,UAAM,iBAAiB,gBAAgB,UAAU,QAAQ;AACzD,QAAI,CAAC,eAAe,SAAS;AAC3B,YAAM,IAAI;AAAA,QACR,yDAAyD,WAAW;AAAA,MACtE;AAAA,IACF;AAEA,WAAO,eAAe;AAAA,EACxB,SAAS,OAAO;AACd,QACE,iBAAiB,SACjB,gBAAgB,SAChB,MAAM,eAAe,KACrB;AACA,aAAO;AAAA,IACT;AACA,UAAM;AAAA,EACR;AACF;AAEO,MAAM,iBAAiB,OAC5B,gBACgC;AAChC,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,UAAU,YAAY;AAC/B;AAEO,MAAM,sBAAsB,OACjC,gBAC2B;AAC3B,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,WAAW,WAAW,GAAG,UAAU;AAC5C;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,oBAAoB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEvE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": ["npmFetch"]
 }