isaacscript 1.2.40 → 1.2.43

package/src/commands/monitor/monitor.ts

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import { fork, spawn } from "child_process";
+import * as JSONC from "jsonc-parser";
 import path from "path";
 import {
   CWD,
@@ -7,29 +8,29 @@ import {
   MAIN_LUA,
   MOD_SOURCE_PATH,
   PROJECT_NAME,
+  TSCONFIG_PATH,
 } from "../../constants";
 import * as file from "../../file";
 import { Config } from "../../types/Config";
 import { error, getModTargetDirectoryName } from "../../utils";
 import { copyWatcherMod } from "./copyWatcherMod";
-import { getTSConfigInclude } from "./getTSConfigInclude";
 import * as notifyGame from "./notifyGame";
 import { spawnSaveDatWriter } from "./spawnSaveDatWriter";
 import { touchWatcherSaveDatFiles } from "./touchWatcherSaveDatFiles";
 
 export function monitor(argv: Record<string, unknown>, config: Config): void {
-  const verbose = argv.verbose === true;
+  const verbose = argv["verbose"] === true;
 
   // If they specified some command-line flags, override the values found in the config file
-  if (argv.modsDirectory !== undefined) {
-    config.modsDirectory = argv.modsDirectory as string; // eslint-disable-line no-param-reassign
+  if (argv["modsDirectory"] !== undefined) {
+    config.modsDirectory = argv["modsDirectory"] as string; // eslint-disable-line no-param-reassign
   }
-  if (argv.saveSlot !== undefined) {
-    config.saveSlot = argv.saveSlot as number; // eslint-disable-line no-param-reassign
+  if (argv["saveSlot"] !== undefined) {
+    config.saveSlot = argv["saveSlot"] as number; // eslint-disable-line no-param-reassign
   }
 
   // Read the "tsconfig.json" file
-  const tsConfigInclude = getTSConfigInclude(verbose);
+  const tsConfigInclude = getFirstTSConfigIncludePath(verbose);
   const resolvedIncludePath = path.resolve(CWD, tsConfigInclude);
   const modTargetDirectoryName = getModTargetDirectoryName(config);
   const modTargetPath = path.join(config.modsDirectory, modTargetDirectoryName);
@@ -140,3 +141,41 @@ function spawnTSTLWatcher() {
     error(`Error: ${processDescription} subprocess exited with code: ${code}`);
   });
 }
+
+function getFirstTSConfigIncludePath(verbose: boolean): string {
+  const tsConfigRaw = file.read(TSCONFIG_PATH, verbose);
+  let tsConfig: Record<string, string[]>;
+  try {
+    tsConfig = JSONC.parse(tsConfigRaw) as Record<string, string[]>;
+  } catch (err) {
+    error(`Failed to parse "${chalk.green(TSCONFIG_PATH)}":`, err);
+  }
+
+  const include = tsConfig["include"];
+  if (include === undefined) {
+    error(
+      `Your "${chalk.green(
+        TSCONFIG_PATH,
+      )}" file does not have an "include" property, which is surely a mistake. Delete the file and re-run ${PROJECT_NAME}.`,
+    );
+  }
+
+  if (!Array.isArray(include)) {
+    error(
+      `Your "${chalk.green(
+        TSCONFIG_PATH,
+      )}" file has an "include" property that is not an array, which is surely a mistake. Delete the file and re-run ${PROJECT_NAME}.`,
+    );
+  }
+
+  const firstInclude = include[0];
+  if (firstInclude === undefined) {
+    error(
+      `Your "${chalk.green(
+        TSCONFIG_PATH,
+      )}" file has an empty "include" property, which is surely a mistake. Delete the file and re-run ${PROJECT_NAME}.`,
+    );
+  }
+
+  return firstInclude;
+}

package/src/commands/monitor/saveDatWriter/saveDatWriter.ts

@@ -5,6 +5,8 @@ import * as file from "../../../file";
 import { ensureAllCases } from "../../../utils";
 import { SaveDatMessage, SaveDatMessageType } from "./types";
 
+const SUBPROCESS_NAME = "save#.dat writer";
+const BASE_ARGV_LENGTH = 2;
 const MAX_MESSAGES = 100;
 const VERBOSE = false;
 
@@ -14,15 +16,14 @@ let saveDatFileName: string;
 init(VERBOSE);
 
 function init(verbose: boolean) {
-  const numArgs = 1;
-  if (process.argv.length !== 2 + numArgs) {
-    send(
-      "The save#.dat writer process did not get the right amount of arguments.",
+  const firstArg = process.argv[BASE_ARGV_LENGTH];
+  if (firstArg === undefined) {
+    throw new Error(
+      `The ${SUBPROCESS_NAME} process did not get a valid first argument.`,
     );
-    process.exit(1);
   }
 
-  saveDatPath = process.argv[2];
+  saveDatPath = firstArg;
   saveDatFileName = path.basename(saveDatPath);
 
   // Check to see if the data directory exists

package/src/commands/publish/publish.ts

@@ -22,11 +22,11 @@ import { gitCommitIfChanges, isGitDirty } from "../init/git";
 const UPDATE_SCRIPT_NAME = "update.sh";
 
 export function publish(argv: Record<string, unknown>, config: Config): void {
-  const skipVersionIncrement = argv.skip === true;
-  const setVersion = argv.setVersion as string | undefined;
-  const dryRun = argv.dryRun === true;
-  const onlyUpload = argv.onlyUpload === true;
-  const verbose = argv.verbose === true;
+  const skipVersionIncrement = argv["skip"] === true;
+  const setVersion = argv["setVersion"] as string | undefined;
+  const dryRun = argv["dryRun"] === true;
+  const onlyUpload = argv["onlyUpload"] === true;
+  const verbose = argv["verbose"] === true;
 
   const modTargetDirectoryName = getModTargetDirectoryName(config);
   const modTargetPath = path.join(config.modsDirectory, modTargetDirectoryName);
@@ -168,7 +168,7 @@ function getVersionFromPackageJSON(verbose: boolean) {
     );
   }
 
-  if (typeof packageJSON.version !== "string") {
+  if (typeof packageJSON["version"] !== "string") {
     error(
       `The "${chalk.green(
         PACKAGE_JSON_PATH,
@@ -176,7 +176,7 @@ function getVersionFromPackageJSON(verbose: boolean) {
     );
   }
 
-  return packageJSON.version;
+  return packageJSON["version"];
 }
 
 function bumpVersionInPackageJSON(version: string, verbose: boolean): string {

package/src/configFile.ts

@@ -9,8 +9,8 @@ import { Config } from "./types/Config";
 import { error } from "./utils";
 
 export async function get(argv: Record<string, unknown>): Promise<Config> {
-  const verbose = argv.verbose === true;
-  const yes = argv.yes === true;
+  const verbose = argv["verbose"] === true;
+  const yes = argv["yes"] === true;
 
   const existingConfig = readExistingConfig(verbose);
   if (existingConfig !== undefined) {

package/src/exec.ts

@@ -68,17 +68,16 @@ export function execShell(
       "execShell cannot execute commands with double quotes in the command.",
     );
   }
-  for (let i = 0; i < args.length; i++) {
-    if (args[i].includes('"')) {
-      error(
-        "execShell cannot execute commands with double quotes in the arguments.",
-      );
-    }
 
-    args[i] = `"${args[i]}"`; // eslint-disable-line no-param-reassign
+  const argsHasDoubleQuotes = args.some((arg) => arg.includes('"'));
+  if (argsHasDoubleQuotes) {
+    error(
+      "execShell cannot execute commands with double quotes in the arguments.",
+    );
   }
 
-  const commandDescription = `${command} ${args.join(" ")}`.trim();
+  const quotedArgs = args.map((arg) => `"${arg}"`);
+  const commandDescription = `${command} ${quotedArgs.join(" ")}`.trim();
 
   if (verbose) {
     console.log(`Executing command: ${commandDescription}`);

package/src/main.ts

@@ -37,7 +37,7 @@ async function main(): Promise<void> {
 
   // Get command line arguments
   const argv = parseArgs();
-  const verbose = argv.verbose === true;
+  const verbose = argv["verbose"] === true;
 
   printBanner();
 
@@ -65,7 +65,7 @@ function printBanner() {
 }
 
 async function handleCommands(argv: Record<string, unknown>, verbose: boolean) {
-  const positionalArgs = argv._ as string[];
+  const positionalArgs = argv["_"] as string[];
   let command: Command;
   if (positionalArgs.length > 0) {
     command = positionalArgs[0] as Command;

package/src/utils.ts

@@ -36,7 +36,7 @@ export function isKebabCase(s: string): boolean {
  * parseIntSafe is a more reliable version of parseInt. By default, "parseInt('1a')" will return
  * "1", which is unexpected. This returns either an integer or NaN.
  */
-export function parseIntSafe(input: string): number {
+export function parseIntSafe(input: unknown): number {
   if (typeof input !== "string") {
     return NaN;
   }
@@ -65,7 +65,7 @@ export function parseIntSafe(input: string): number {
 
 export function parseSemVer(
   versionString: string,
-): [major: number, minor: number, patch: number] {
+): [majorVersion: number, minorVersion: number, patchVersion: number] {
   const match = /^v*(\d+)\.(\d+)\.(\d+)/g.exec(versionString);
   if (match === null) {
     error(`Failed to parse the version string of: ${versionString}`);
@@ -78,12 +78,12 @@ export function parseSemVer(
     error(`Failed to parse the major version number from: ${versionString}`);
   }
 
-  const minorVersion = parseInt(minorVersionString, 10);
+  const minorVersion = parseIntSafe(minorVersionString);
   if (Number.isNaN(minorVersion)) {
     error(`Failed to parse the minor version number from: ${versionString}`);
   }
 
-  const patchVersion = parseInt(patchVersionString, 10);
+  const patchVersion = parseIntSafe(patchVersionString);
   if (Number.isNaN(patchVersion)) {
     error(`Failed to parse the patch version number from: ${versionString}`);
   }

package/src/validateNodeVersion.ts

@@ -8,14 +8,14 @@ const REQUIRED_NODE_JS_MAJOR_VERSION = 16;
 // 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 nodeJSVersionString = process.version;
-  const [majorVersion] = parseSemVer(nodeJSVersionString);
+  const { version } = process;
+  const [majorVersion] = parseSemVer(version);
 
   if (majorVersion >= REQUIRED_NODE_JS_MAJOR_VERSION) {
     return;
   }
 
-  console.error(`Your Node.js version is: ${chalk.red(nodeJSVersionString)}`);
+  console.error(`Your Node.js version is: ${chalk.red(version)}`);
   console.error(
     `${PROJECT_NAME} requires a Node.js version of ${chalk.red(
       `${REQUIRED_NODE_JS_MAJOR_VERSION}.0.0`,

package/tsconfig.eslint.json

@@ -1,8 +1,6 @@
 // A special TypeScript configuration file, used by ESLint only
 {
   "extends": "./tsconfig.json",
-
-  // A list of the TypeScript files to compile
   "include": [
     // This must match the "include" setting in the "tsconfig.json" file
     "./src/**/*.ts",

package/update.sh

@@ -13,5 +13,9 @@ OLD_HASH=$(md5sum "$PACKAGE_JSON")
 npx npm-check-updates --upgrade --packageFile "$PACKAGE_JSON" --reject chalk
 NEW_HASH=$(md5sum "$PACKAGE_JSON")
 if [[ $OLD_HASH != $NEW_HASH ]]; then
-  npm install
+  if test -f "$DIR/yarn.lock"; then
+    yarn
+  else
+    npm install
+  fi
 fi

package/dist/src/commands/monitor/getTSConfigInclude.js

@@ -1,53 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTSConfigInclude = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const JSONC = __importStar(require("jsonc-parser"));
-const constants_1 = require("../../constants");
-const file = __importStar(require("../../file"));
-const utils_1 = require("../../utils");
-function getTSConfigInclude(verbose) {
-    const tsConfigRaw = file.read(constants_1.TSCONFIG_PATH, verbose);
-    let tsConfig;
-    try {
-        tsConfig = JSONC.parse(tsConfigRaw);
-    }
-    catch (err) {
-        (0, utils_1.error)(`Failed to parse "${chalk_1.default.green(constants_1.TSCONFIG_PATH)}":`, err);
-    }
-    if (!Object.prototype.hasOwnProperty.call(tsConfig, "include")) {
-        (0, utils_1.error)(`Your "${chalk_1.default.green(constants_1.TSCONFIG_PATH)}" file does not have an include directive, which is surely a mistake. Delete the file and re-run isaacscript.`);
-    }
-    if (tsConfig.include.length === 0) {
-        (0, utils_1.error)(`Your "${chalk_1.default.green(constants_1.TSCONFIG_PATH)}" file has an empty include directive, which is surely a mistake. Delete the file and re-run isaacscript.`);
-    }
-    return tsConfig.include[0];
-}
-exports.getTSConfigInclude = getTSConfigInclude;
-//# sourceMappingURL=getTSConfigInclude.js.map

package/dist/src/commands/monitor/getTSConfigInclude.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getTSConfigInclude.js","sourceRoot":"","sources":["../../../../src/commands/monitor/getTSConfigInclude.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oDAAsC;AACtC,+CAAgD;AAChD,iDAAmC;AACnC,uCAAoC;AAEpC,SAAgB,kBAAkB,CAAC,OAAgB;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,yBAAa,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,QAAkC,CAAC;IACvC,IAAI;QACF,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAA6B,CAAC;KACjE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,aAAK,EAAC,oBAAoB,eAAK,CAAC,KAAK,CAAC,yBAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChE;IAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE;QAC9D,IAAA,aAAK,EACH,SAAS,eAAK,CAAC,KAAK,CAClB,yBAAa,CACd,+GAA+G,CACjH,CAAC;KACH;IACD,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,IAAA,aAAK,EACH,SAAS,eAAK,CAAC,KAAK,CAClB,yBAAa,CACd,2GAA2G,CAC7G,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAzBD,gDAyBC"}

package/src/commands/monitor/getTSConfigInclude.ts

@@ -1,32 +0,0 @@
-import chalk from "chalk";
-import * as JSONC from "jsonc-parser";
-import { TSCONFIG_PATH } from "../../constants";
-import * as file from "../../file";
-import { error } from "../../utils";
-
-export function getTSConfigInclude(verbose: boolean): string {
-  const tsConfigRaw = file.read(TSCONFIG_PATH, verbose);
-  let tsConfig: Record<string, string[]>;
-  try {
-    tsConfig = JSONC.parse(tsConfigRaw) as Record<string, string[]>;
-  } catch (err) {
-    error(`Failed to parse "${chalk.green(TSCONFIG_PATH)}":`, err);
-  }
-
-  if (!Object.prototype.hasOwnProperty.call(tsConfig, "include")) {
-    error(
-      `Your "${chalk.green(
-        TSCONFIG_PATH,
-      )}" file does not have an include directive, which is surely a mistake. Delete the file and re-run isaacscript.`,
-    );
-  }
-  if (tsConfig.include.length === 0) {
-    error(
-      `Your "${chalk.green(
-        TSCONFIG_PATH,
-      )}" file has an empty include directive, which is surely a mistake. Delete the file and re-run isaacscript.`,
-    );
-  }
-
-  return tsConfig.include[0];
-}