isaacscript 1.1.74-dev.3 → 1.2.3

package/src/util.ts

@@ -1,7 +1,5 @@
-import chalk from "chalk";
-import { execSync, spawnSync, SpawnSyncReturns } from "child_process";
 import moment from "moment";
-import { CURRENT_DIRECTORY_NAME, CWD } from "./constants";
+import { CURRENT_DIRECTORY_NAME } from "./constants";
 import { Config } from "./types/Config";
 
 export const ensureAllCases = (obj: never): never => obj;
@@ -11,82 +9,6 @@ export function error(...args: unknown[]): never {
   process.exit(1);
 }
 
-export function execExe(path: string, cwd = CWD): string {
-  let stdout: string;
-  try {
-    const buffer = execSync(`"${path}"`, {
-      cwd,
-    });
-    stdout = buffer.toString().trim();
-  } catch (err) {
-    console.error(`Failed to run "${chalk.green(path)}":`, err);
-    process.exit(1);
-  }
-
-  return stdout;
-}
-
-/** Returns an array of exit status and stdout. */
-export function execShell(
-  command: string,
-  args: string[] = [],
-  allowFailure = false,
-  cwd = CWD,
-): [number | null, string] {
-  // On Windows, "spawnSync()" will not account for spaces in arguments
-  // Thus, wrap everything in a double quote
-  // This will cause arguments that naturally have double quotes to fail
-  if (command.includes('"')) {
-    throw new Error(
-      "execShell cannot execute commands with double quotes in the command.",
-    );
-  }
-  for (let i = 0; i < args.length; i++) {
-    if (args[i].includes('"')) {
-      throw new Error(
-        "execShell cannot execute commands with double quotes in the arguments.",
-      );
-    }
-
-    args[i] = `"${args[i]}"`; // eslint-disable-line no-param-reassign
-  }
-
-  const commandDescription = `${command} ${args.join(" ")}`.trim();
-
-  let spawnSyncReturns: SpawnSyncReturns<Buffer>;
-  try {
-    spawnSyncReturns = spawnSync(command, args, {
-      shell: true,
-      cwd,
-    });
-  } catch (err) {
-    error(
-      `Failed to run the "${chalk.green(commandDescription)}" command:`,
-      err,
-    );
-  }
-
-  const exitStatus = spawnSyncReturns.status;
-  const stdout = spawnSyncReturns.output.join("\n").trim();
-
-  if (exitStatus !== 0) {
-    if (allowFailure) {
-      return [exitStatus, stdout];
-    }
-
-    console.error(
-      `Failed to run the "${chalk.green(
-        commandDescription,
-      )}" command with an exit code of ${exitStatus}.`,
-    );
-    console.error("The output was as follows:");
-    console.error(stdout);
-    process.exit(1);
-  }
-
-  return [exitStatus, stdout];
-}
-
 export function getModTargetDirectoryName(config: Config): string {
   return config.customTargetModDirectoryName === undefined
     ? CURRENT_DIRECTORY_NAME
@@ -132,3 +54,31 @@ export function parseIntSafe(input: string): number {
 
   return parseInt(trimmedInput, 10);
 }
+
+export function parseSemVer(
+  versionString: string,
+): [major: number, minor: number, patch: number] {
+  const match = /^v*(\d+)\.(\d+)\.(\d+)/g.exec(versionString);
+  if (match === null) {
+    error(`Failed to parse the version string of: ${versionString}`);
+  }
+
+  const [, majorVersionString, minorVersionString, patchVersionString] = match;
+
+  const majorVersion = parseIntSafe(majorVersionString);
+  if (Number.isNaN(majorVersion)) {
+    error(`Failed to parse the major version number from: ${versionString}`);
+  }
+
+  const minorVersion = parseInt(minorVersionString, 10);
+  if (Number.isNaN(minorVersion)) {
+    error(`Failed to parse the minor version number from: ${versionString}`);
+  }
+
+  const patchVersion = parseInt(patchVersionString, 10);
+  if (Number.isNaN(patchVersion)) {
+    error(`Failed to parse the patch version number from: ${versionString}`);
+  }
+
+  return [majorVersion, minorVersion, patchVersion];
+}

package/src/validateNodeVersion.ts

@@ -1,56 +1,24 @@
 import chalk from "chalk";
 import { PROJECT_NAME } from "./constants";
-import { error } from "./util";
+import { parseSemVer } from "./util";
 
-const REQUIRED_MAJOR_VERSION = 16;
+const REQUIRED_NODE_JS_MAJOR_VERSION = 16;
 
 // This program requires Node to be at least v16.0.0,
 // since that is the version that added the "fs.rmSync()" function
 // (I tested on Node v15.0.0 and it failed)
 export function validateNodeVersion(): void {
-  const { version } = process;
+  const nodeJSVersionString = process.version;
+  const [majorVersion] = parseSemVer(nodeJSVersionString);
 
-  const match = /^v(\d+)\.(\d+)\.(\d)+$/g.exec(version);
-  if (match === null) {
-    error(`Failed to parse your NodeJS version of: ${version}`);
-  }
-
-  const majorVersionString = match[1];
-  const majorVersion = parseInt(majorVersionString, 10);
-  if (Number.isNaN(majorVersion)) {
-    error(
-      `Failed to parse the major version number from: ${majorVersionString}`,
-    );
-  }
-
-  const minorVersionString = match[2];
-  const minorVersion = parseInt(minorVersionString, 10);
-  if (Number.isNaN(minorVersion)) {
-    error(
-      `Failed to parse the minor version number from: ${minorVersionString}`,
-    );
-  }
-
-  const patchVersionString = match[3];
-  const patchVersion = parseInt(patchVersionString, 10);
-  if (Number.isNaN(patchVersion)) {
-    error(
-      `Failed to parse the patch version number from: ${patchVersionString}`,
-    );
-  }
-
-  if (majorVersion >= REQUIRED_MAJOR_VERSION) {
+  if (majorVersion >= REQUIRED_NODE_JS_MAJOR_VERSION) {
     return;
   }
 
-  console.error(
-    `Your Node.js version is: ${chalk.red(
-      `${majorVersionString}.${minorVersionString}.${patchVersionString}`,
-    )}`,
-  );
+  console.error(`Your Node.js version is: ${chalk.red(nodeJSVersionString)}`);
   console.error(
     `${PROJECT_NAME} requires a Node.js version of ${chalk.red(
-      "16.0.0",
+      `${REQUIRED_NODE_JS_MAJOR_VERSION}.0.0`,
     )} or greater.`,
   );
   console.error(