@aws-cdk-testing/cli-integ 3.2.2 → 3.2.4

package/package.json

@@ -108,7 +108,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.2",
+  "version": "3.2.4",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }

package/tests/tool-integrations/amplify.integtest.js

@@ -7,11 +7,22 @@ const lib_1 = require("../../lib");
 const TIMEOUT = 1800000;
 (0, lib_1.integTest)('amplify integration', (0, with_tool_context_1.withToolContext)(async (context) => {
     const shell = lib_1.ShellHelper.fromContext(context);
-    await shell.shell(['npm', 'create', '-y', 'amplify@latest']);
-    await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
+    ////////////////////////////////////////////////////////////////////////
+    //  Make sure that create-amplify installs the right versions of the CLI and framework
+    //
+    // Install `create-amplify` without running it, then hack the json file with the
+    // package versions in it before we execute.
+    await shell.shell(['npm', 'init', '-y']);
+    await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
     // This will create 'package.json' implicating a certain version of the CDK
-    await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
-    await shell.shell(['npm', 'install']);
+    await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);
+    await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
+    ////////////////////////////////////////////////////////////////////////
+    //  Run the `npm create` workflow
+    //
+    // I tested to confirm that this will use the locally installed `create-amplify`
+    await shell.shell(['npm', 'create', '-y', 'amplify']);
+    await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
     await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {
         modEnv: {
             AWS_REGION: context.aws.region,
@@ -29,11 +40,55 @@ const TIMEOUT = 1800000;
         });
     }
 }), TIMEOUT);
-async function updateCdkDependency(context, cliVersion, libVersion) {
-    const filename = path.join(context.integTestDir, 'package.json');
-    const pj = JSON.parse(await fs_1.promises.readFile(filename, { encoding: 'utf-8' }));
-    pj.devDependencies['aws-cdk'] = cliVersion;
-    pj.devDependencies['aws-cdk-lib'] = libVersion;
-    await fs_1.promises.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
+async function mutateAmplifyDepOnCdk(context, cliVersion, libVersion) {
+    // default_packages.json is where create-amplify reads when installing npm dependencies
+    const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
+    const amplifyDepJson = JSON.parse(await fs_1.promises.readFile(amplifyDepFile, { encoding: 'utf-8' }));
+    // Be extra paranoid about the types here, since we don't fully control them
+    assertIsObject(amplifyDepJson);
+    assertIsStringArray(amplifyDepJson.defaultDevPackages);
+    replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);
+    replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);
+    await fs_1.promises.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });
+    const packageJsonFile = path.join(context.integTestDir, 'package.json');
+    const packageJson = JSON.parse(await fs_1.promises.readFile(packageJsonFile, { encoding: 'utf-8' }));
+    assertIsObject(packageJson);
+    packageJson.overrides = {
+        "aws-cdk-lib": libVersion,
+    };
+    await fs_1.promises.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' });
+}
+/**
+ * Mutably update the given string array, replacing the version of packages with the given name
+ *
+ * We assume the list of packages is a string array of the form
+ *
+ * ```
+ * ["package@version", "package@version", ...]
+ * ```
+ *
+ * It's a failure if we don't find an entry to update.
+ */
+function replacePackageVersionIn(packName, version, xs) {
+    let didUpdate = false;
+    for (let i = 0; i < xs.length; i++) {
+        if (xs[i].startsWith(`${packName}@`)) {
+            xs[i] = `${packName}@${version}`;
+            didUpdate = true;
+        }
+    }
+    if (!didUpdate) {
+        throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);
+    }
+}
+function assertIsObject(xs) {
+    if (typeof xs !== 'object' || xs === null) {
+        throw new Error(`Expected object, got ${JSON.stringify(xs)}`);
+    }
+}
+function assertIsStringArray(xs) {
+    if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {
+        throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW1wbGlmeS5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJhbXBsaWZ5LmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUFvQztBQUNwQyw2QkFBNkI7QUFDN0IsMkRBQXNEO0FBQ3RELG1DQUE4RTtBQUU5RSxNQUFNLE9BQU8sR0FBRyxPQUFRLENBQUM7QUFFekIsSUFBQSxlQUFTLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQ0FBZSxFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUNqRSxNQUFNLEtBQUssR0FBRyxpQkFBVyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUUvQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7SUFDN0QsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFFeEUsMkVBQTJFO0lBQzNFLE1BQU0sbUJBQW1CLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsbUJBQW1CLEVBQUUsRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLHlCQUF5QixFQUFFLENBQUMsQ0FBQztJQUN6SCxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUV0QyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxRQUFRLENBQUMsRUFBRTtRQUN0RCxNQUFNLEVBQUU7WUFDTixVQUFVLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO1NBQy9CO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsSUFBSSxDQUFDO1FBRUgsNEVBQTRFO1FBQzVFLGlCQUFpQjtJQUVuQixDQUFDO1lBQVMsQ0FBQztRQUNULE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsRUFBRTtZQUMvRCxNQUFNLEVBQUU7Z0JBQ04sVUFBVSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTthQUMvQjtTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7QUFDSCxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUViLEtBQUssVUFBVSxtQkFBbUIsQ0FBQyxPQUFrQyxFQUFFLFVBQWtCLEVBQUUsVUFBa0I7SUFDM0csTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBQ2pFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxhQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDMUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsR0FBRyxVQUFVLENBQUM7SUFDM0MsRUFBRSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsR0FBRyxVQUFVLENBQUM7SUFDL0MsTUFBTSxhQUFFLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUN4RixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcHJvbWlzZXMgYXMgZnMgfSBmcm9tICdmcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgd2l0aFRvb2xDb250ZXh0IH0gZnJvbSAnLi93aXRoLXRvb2wtY29udGV4dCc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIFNoZWxsSGVscGVyLCBUZW1wb3JhcnlEaXJlY3RvcnlDb250ZXh0IH0gZnJvbSAnLi4vLi4vbGliJztcblxuY29uc3QgVElNRU9VVCA9IDE4MDBfMDAwO1xuXG5pbnRlZ1Rlc3QoJ2FtcGxpZnkgaW50ZWdyYXRpb24nLCB3aXRoVG9vbENvbnRleHQoYXN5bmMgKGNvbnRleHQpID0+IHtcbiAgY29uc3Qgc2hlbGwgPSBTaGVsbEhlbHBlci5mcm9tQ29udGV4dChjb250ZXh0KTtcblxuICBhd2FpdCBzaGVsbC5zaGVsbChbJ25wbScsICdjcmVhdGUnLCAnLXknLCAnYW1wbGlmeUBsYXRlc3QnXSk7XG4gIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnB4JywgJ2FtcHgnLCAnY29uZmlndXJlJywgJ3RlbGVtZXRyeScsICdkaXNhYmxlJ10pO1xuXG4gIC8vIFRoaXMgd2lsbCBjcmVhdGUgJ3BhY2thZ2UuanNvbicgaW1wbGljYXRpbmcgYSBjZXJ0YWluIHZlcnNpb24gb2YgdGhlIENES1xuICBhd2FpdCB1cGRhdGVDZGtEZXBlbmRlbmN5KGNvbnRleHQsIGNvbnRleHQucGFja2FnZXMucmVxdWVzdGVkQ2xpVmVyc2lvbigpLCBjb250ZXh0LnBhY2thZ2VzLnJlcXVlc3RlZEZyYW1ld29ya1ZlcnNpb24oKSk7XG4gIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnBtJywgJ2luc3RhbGwnXSk7XG5cbiAgYXdhaXQgc2hlbGwuc2hlbGwoWyducHgnLCAnYW1weCcsICdzYW5kYm94JywgJy0tb25jZSddLCB7XG4gICAgbW9kRW52OiB7XG4gICAgICBBV1NfUkVHSU9OOiBjb250ZXh0LmF3cy5yZWdpb24sXG4gICAgfSxcbiAgfSk7XG4gIHRyeSB7XG5cbiAgICAvLyBGdXR1cmUgY29kZSBnb2VzIGhlcmUsIHB1dHRpbmcgdGhlIHRyeS9maW5hbGx5IGhlcmUgYWxyZWFkeSBzbyBpdCBkb2Vzbid0XG4gICAgLy8gZ2V0IGZvcmdvdHRlbi5cblxuICB9IGZpbmFsbHkge1xuICAgIGF3YWl0IHNoZWxsLnNoZWxsKFsnbnB4JywgJ2FtcHgnLCAnc2FuZGJveCcsICdkZWxldGUnLCAnLS15ZXMnXSwge1xuICAgICAgbW9kRW52OiB7XG4gICAgICAgIEFXU19SRUdJT046IGNvbnRleHQuYXdzLnJlZ2lvbixcbiAgICAgIH0sXG4gICAgfSk7XG4gIH1cbn0pLCBUSU1FT1VUKTtcblxuYXN5bmMgZnVuY3Rpb24gdXBkYXRlQ2RrRGVwZW5kZW5jeShjb250ZXh0OiBUZW1wb3JhcnlEaXJlY3RvcnlDb250ZXh0LCBjbGlWZXJzaW9uOiBzdHJpbmcsIGxpYlZlcnNpb246IHN0cmluZykge1xuICBjb25zdCBmaWxlbmFtZSA9IHBhdGguam9pbihjb250ZXh0LmludGVnVGVzdERpciwgJ3BhY2thZ2UuanNvbicpO1xuICBjb25zdCBwaiA9IEpTT04ucGFyc2UoYXdhaXQgZnMucmVhZEZpbGUoZmlsZW5hbWUsIHsgZW5jb2Rpbmc6ICd1dGYtOCcgfSkpO1xuICBwai5kZXZEZXBlbmRlbmNpZXNbJ2F3cy1jZGsnXSA9IGNsaVZlcnNpb247XG4gIHBqLmRldkRlcGVuZGVuY2llc1snYXdzLWNkay1saWInXSA9IGxpYlZlcnNpb247XG4gIGF3YWl0IGZzLndyaXRlRmlsZShmaWxlbmFtZSwgSlNPTi5zdHJpbmdpZnkocGosIHVuZGVmaW5lZCwgMiksIHsgZW5jb2Rpbmc6ICd1dGYtOCcgfSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"amplify.integtest.js","sourceRoot":"","sources":["amplify.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport { withToolContext } from './with-tool-context';\nimport { integTest, ShellHelper, TemporaryDirectoryContext } from '../../lib';\n\nconst TIMEOUT = 1800_000;\n\nintegTest('amplify integration', withToolContext(async (context) => {\n  const shell = ShellHelper.fromContext(context);\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Make sure that create-amplify installs the right versions of the CLI and framework\n  //\n\n  // Install `create-amplify` without running it, then hack the json file with the\n  // package versions in it before we execute.\n  await shell.shell(['npm', 'init', '-y']);\n  await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);\n  // This will create 'package.json' implicating a certain version of the CDK\n  await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);\n  await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());\n\n  ////////////////////////////////////////////////////////////////////////\n  //  Run the `npm create` workflow\n  //\n\n  // I tested to confirm that this will use the locally installed `create-amplify`\n  await shell.shell(['npm', 'create', '-y', 'amplify']);\n  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);\n\n  await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {\n    modEnv: {\n      AWS_REGION: context.aws.region,\n    },\n  });\n  try {\n\n    // Future code goes here, putting the try/finally here already so it doesn't\n    // get forgotten.\n\n  } finally {\n    await shell.shell(['npx', 'ampx', 'sandbox', 'delete', '--yes'], {\n      modEnv: {\n        AWS_REGION: context.aws.region,\n      },\n    });\n  }\n}), TIMEOUT);\n\nasync function mutateAmplifyDepOnCdk(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {\n  // default_packages.json is where create-amplify reads when installing npm dependencies\n  const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');\n  const amplifyDepJson: unknown = JSON.parse(await fs.readFile(amplifyDepFile, { encoding: 'utf-8' }));\n\n  // Be extra paranoid about the types here, since we don't fully control them\n  assertIsObject(amplifyDepJson);\n  assertIsStringArray(amplifyDepJson.defaultDevPackages);\n\n  replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);\n  replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);\n\n  await fs.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });\n\n  const packageJsonFile = path.join(context.integTestDir, 'package.json');\n  const packageJson: unknown = JSON.parse(await fs.readFile(packageJsonFile, { encoding: 'utf-8' }));\n\n  assertIsObject(packageJson);\n  packageJson.overrides = {\n    \"aws-cdk-lib\": libVersion,\n  };\n  await fs.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' })\n}\n\n/**\n * Mutably update the given string array, replacing the version of packages with the given name\n *\n * We assume the list of packages is a string array of the form\n *\n * ```\n * [\"package@version\", \"package@version\", ...]\n * ```\n *\n * It's a failure if we don't find an entry to update.\n */\nfunction replacePackageVersionIn(packName: string, version: string, xs: string[]) {\n  let didUpdate = false;\n  for (let i = 0; i < xs.length; i++) {\n    if (xs[i].startsWith(`${packName}@`)) {\n      xs[i] = `${packName}@${version}`;\n      didUpdate = true;\n    }\n  }\n\n  if (!didUpdate) {\n    throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {\n  if (typeof xs !== 'object' || xs === null) {\n    throw new Error(`Expected object, got ${JSON.stringify(xs)}`);\n  }\n}\n\nfunction assertIsStringArray(xs: unknown): asserts xs is string[] {\n  if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {\n    throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);\n  }\n}\n"]}

package/tests/tool-integrations/amplify.integtest.ts

@@ -8,12 +8,25 @@ const TIMEOUT = 1800_000;
 integTest('amplify integration', withToolContext(async (context) => {
   const shell = ShellHelper.fromContext(context);
 
-  await shell.shell(['npm', 'create', '-y', 'amplify@latest']);
-  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
+  ////////////////////////////////////////////////////////////////////////
+  //  Make sure that create-amplify installs the right versions of the CLI and framework
+  //
 
+  // Install `create-amplify` without running it, then hack the json file with the
+  // package versions in it before we execute.
+  await shell.shell(['npm', 'init', '-y']);
+  await shell.shell(['npm', 'install', '--save-dev', 'create-amplify@latest']);
   // This will create 'package.json' implicating a certain version of the CDK
-  await updateCdkDependency(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
-  await shell.shell(['npm', 'install']);
+  await shell.shell(['npm', 'config', 'set', 'save-exact', 'true']);
+  await mutateAmplifyDepOnCdk(context, context.packages.requestedCliVersion(), context.packages.requestedFrameworkVersion());
+
+  ////////////////////////////////////////////////////////////////////////
+  //  Run the `npm create` workflow
+  //
+
+  // I tested to confirm that this will use the locally installed `create-amplify`
+  await shell.shell(['npm', 'create', '-y', 'amplify']);
+  await shell.shell(['npx', 'ampx', 'configure', 'telemetry', 'disable']);
 
   await shell.shell(['npx', 'ampx', 'sandbox', '--once'], {
     modEnv: {
@@ -34,10 +47,63 @@ integTest('amplify integration', withToolContext(async (context) => {
   }
 }), TIMEOUT);
 
-async function updateCdkDependency(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
-  const filename = path.join(context.integTestDir, 'package.json');
-  const pj = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));
-  pj.devDependencies['aws-cdk'] = cliVersion;
-  pj.devDependencies['aws-cdk-lib'] = libVersion;
-  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
+async function mutateAmplifyDepOnCdk(context: TemporaryDirectoryContext, cliVersion: string, libVersion: string) {
+  // default_packages.json is where create-amplify reads when installing npm dependencies
+  const amplifyDepFile = path.join(context.integTestDir, 'node_modules', 'create-amplify', 'lib', 'default_packages.json');
+  const amplifyDepJson: unknown = JSON.parse(await fs.readFile(amplifyDepFile, { encoding: 'utf-8' }));
+
+  // Be extra paranoid about the types here, since we don't fully control them
+  assertIsObject(amplifyDepJson);
+  assertIsStringArray(amplifyDepJson.defaultDevPackages);
+
+  replacePackageVersionIn('aws-cdk', cliVersion, amplifyDepJson.defaultDevPackages);
+  replacePackageVersionIn('aws-cdk-lib', libVersion, amplifyDepJson.defaultDevPackages);
+
+  await fs.writeFile(amplifyDepFile, JSON.stringify(amplifyDepJson, undefined, 2), { encoding: 'utf-8' });
+
+  const packageJsonFile = path.join(context.integTestDir, 'package.json');
+  const packageJson: unknown = JSON.parse(await fs.readFile(packageJsonFile, { encoding: 'utf-8' }));
+
+  assertIsObject(packageJson);
+  packageJson.overrides = {
+    "aws-cdk-lib": libVersion,
+  };
+  await fs.writeFile(packageJsonFile, JSON.stringify(packageJson, undefined, 2), { encoding: 'utf-8' })
+}
+
+/**
+ * Mutably update the given string array, replacing the version of packages with the given name
+ *
+ * We assume the list of packages is a string array of the form
+ *
+ * ```
+ * ["package@version", "package@version", ...]
+ * ```
+ *
+ * It's a failure if we don't find an entry to update.
+ */
+function replacePackageVersionIn(packName: string, version: string, xs: string[]) {
+  let didUpdate = false;
+  for (let i = 0; i < xs.length; i++) {
+    if (xs[i].startsWith(`${packName}@`)) {
+      xs[i] = `${packName}@${version}`;
+      didUpdate = true;
+    }
+  }
+
+  if (!didUpdate) {
+    throw new Error(`Did not find a package version to update for ${packName} in ${JSON.stringify(xs)}`);
+  }
+}
+
+function assertIsObject(xs: unknown): asserts xs is Record<string, unknown> {
+  if (typeof xs !== 'object' || xs === null) {
+    throw new Error(`Expected object, got ${JSON.stringify(xs)}`);
+  }
+}
+
+function assertIsStringArray(xs: unknown): asserts xs is string[] {
+  if (!Array.isArray(xs) || xs.length === 0 || typeof xs[0] !== 'string') {
+    throw new Error(`Expected list of strings, got ${JSON.stringify(xs)}`);
+  }
 }