isaacscript 1.2.6 → 1.2.7

package/src/commands/init/checkIfProjectPathExists.ts

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { CWD } from "../../constants";
 import * as file from "../../file";
 import { getInputYesNo } from "../../prompt";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 export async function checkIfProjectPathExists(
   projectPath: string,

package/src/commands/init/checkModTargetDirectory.ts

@@ -3,7 +3,7 @@ import path from "path";
 import { PROJECT_NAME } from "../../constants";
 import * as file from "../../file";
 import { getInputYesNo } from "../../prompt";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 export async function checkModTargetDirectory(
   modsDirectory: string,

package/src/commands/init/createMod.ts

@@ -23,7 +23,7 @@ import { execShell } from "../../exec";
 import * as file from "../../file";
 import { getInputString, getInputYesNo } from "../../prompt";
 import { GitHubCLIHostsYAML } from "../../types/GitHubCLIHostsYAML";
-import { error, parseSemVer } from "../../util";
+import { error, parseSemVer } from "../../utils";
 
 const REQUIRED_GIT_MAJOR_VERSION = 2;
 const REQUIRED_GIT_MINOR_VERSION = 30;

package/src/commands/init/getModsDir.ts

@@ -3,7 +3,7 @@ import path from "path";
 import { HOME_DIR } from "../../constants";
 import * as file from "../../file";
 import { getInputString } from "../../prompt";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 const MODS = "mods";
 

package/src/commands/init/getProjectPath.ts

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import path from "path";
 import { CURRENT_DIRECTORY_NAME, CWD } from "../../constants";
 import { getInputString, getInputYesNo } from "../../prompt";
-import { hasWhiteSpace } from "../../util";
+import { hasWhiteSpace } from "../../utils";
 
 // From: https://gist.github.com/doctaphred/d01d05291546186941e1b7ddc02034d3
 const ILLEGAL_CHARACTERS_FOR_WINDOWS_FILENAMES = [

package/src/commands/init/installVSCodeExtensions.ts

@@ -3,7 +3,7 @@ import * as JSONC from "jsonc-parser";
 import path from "path";
 import { execShell } from "../../exec";
 import * as file from "../../file";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 export function installVSCodeExtensions(
   projectPath: string,

package/src/commands/init/promptSaveSlot.ts

@@ -1,5 +1,5 @@
 import { getInputInt } from "../../prompt";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 export async function promptSaveSlot(
   argv: Record<string, unknown>,

package/src/commands/monitor/getTSConfigInclude.ts

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import * as JSONC from "jsonc-parser";
 import { TSCONFIG_PATH } from "../../constants";
 import * as file from "../../file";
-import { error } from "../../util";
+import { error } from "../../utils";
 
 export function getTSConfigInclude(): string {
   const tsConfigRaw = file.read(TSCONFIG_PATH);

package/src/commands/monitor/monitor.ts

@@ -1,18 +1,16 @@
 import chalk from "chalk";
-import { ChildProcessWithoutNullStreams, fork, spawn } from "child_process";
+import { fork, spawn } from "child_process";
 import path from "path";
 import {
-  CUSTOM_NODE_JS_STACK_SIZE,
   CWD,
   FILE_SYNCED_MESSAGE,
   MAIN_LUA,
   MOD_SOURCE_PATH,
-  PACKAGE_JSON,
   PROJECT_NAME,
 } from "../../constants";
 import * as file from "../../file";
 import { Config } from "../../types/Config";
-import { error, getModTargetDirectoryName } from "../../util";
+import { error, getModTargetDirectoryName, getTSTLArgs } from "../../utils";
 import { copyWatcherMod } from "./copyWatcherMod";
 import { getTSConfigInclude } from "./getTSConfigInclude";
 import * as notifyGame from "./notifyGame";
@@ -53,7 +51,7 @@ export function monitor(argv: Record<string, unknown>, config: Config): void {
   spawnModDirectorySyncer(config);
 
   // Subprocess #3 - tstl --watch (to automatically convert TypeScript to Lua)
-  spawnTSTLWatcher(argv);
+  spawnTSTLWatcher();
 
   // Also, start constantly pinging the watcher mod
   setInterval(() => {
@@ -101,42 +99,12 @@ function spawnModDirectorySyncer(config: Config) {
   });
 }
 
-function spawnTSTLWatcher(argv: Record<string, unknown>) {
+function spawnTSTLWatcher() {
   const processDescription = "tstl";
-  const crashDebug = argv.crashDebug === true;
-
-  const tstlArgs = ["--watch", "--preserveWatchOutput"];
-  if (crashDebug) {
-    tstlArgs.push("--luaPlugins");
-    tstlArgs.push(
-      '\'{ "name": "./node_modules/isaacscript/src/plugins/addCrashDebugStatements.ts" }\'',
-    );
-  }
-
-  let tstl: ChildProcessWithoutNullStreams;
-  if (runningFromLocalPath()) {
-    const tstlPath = path.join(
-      CWD,
-      "..",
-      "isaacscript",
-      "node_modules",
-      "typescript-to-lua",
-      "dist",
-      "tstl.js",
-    );
-    tstl = spawn("node", [tstlPath, ...tstlArgs], {
-      shell: true,
-      cwd: CWD,
-    });
-  } else {
-    tstl = spawn(
-      "npx",
-      [`--stack-size=${CUSTOM_NODE_JS_STACK_SIZE}`, "tstl", ...tstlArgs],
-      {
-        shell: true,
-      },
-    );
-  }
+  const tstlArgs = getTSTLArgs(true);
+  const tstl = spawn("node", tstlArgs, {
+    shell: true,
+  });
 
   tstl.stdout.on("data", (data: Buffer[]) => {
     const msg = data.toString().trim();
@@ -173,11 +141,3 @@ function spawnTSTLWatcher(argv: Record<string, unknown>) {
     error(`Error: ${processDescription} subprocess exited with code: ${code}`);
   });
 }
-
-// Returns whether or not IsaacScript is a local path in "package.json"
-// e.g. "isaacscript": "../isaacscript"
-function runningFromLocalPath() {
-  const packageJSONPath = path.join(CWD, PACKAGE_JSON);
-  const packageJSON = file.read(packageJSONPath);
-  return packageJSON.includes('"isaacscript": "file:../isaacscript"');
-}

package/src/commands/monitor/notifyGame.ts

@@ -1,5 +1,5 @@
 import chalk from "chalk";
-import { getTime } from "../../util";
+import { getTime } from "../../utils";
 import { sendMsgToSaveDatWriter } from "./spawnSaveDatWriter";
 
 export function msg(data: string): void {

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

@@ -3,7 +3,7 @@ import * as JSONC from "jsonc-parser";
 import path from "path";
 import { PROJECT_NAME } from "../../../constants";
 import * as file from "../../../file";
-import { ensureAllCases, error } from "../../../util";
+import { ensureAllCases, error } from "../../../utils";
 import { SaveDatMessage, SaveDatMessageType } from "./types";
 
 const MAX_MESSAGES = 100;

package/src/commands/monitor/spawnSaveDatWriter.ts

@@ -2,7 +2,7 @@ import { ChildProcess, fork } from "child_process";
 import path from "path";
 import { WATCHER_MOD_NAME } from "../../constants";
 import { Config } from "../../types/Config";
-import { error } from "../../util";
+import { error } from "../../utils";
 import { SaveDatMessage } from "./saveDatWriter/types";
 
 let saveDatWriter: ChildProcess | null = null;

package/src/commands/publish/publish.ts

@@ -15,7 +15,7 @@ import {
 import { execExe, execShell } from "../../exec";
 import * as file from "../../file";
 import { Config } from "../../types/Config";
-import { error, getModTargetDirectoryName, parseIntSafe } from "../../util";
+import { error, getModTargetDirectoryName, parseIntSafe } from "../../utils";
 import { compileAndCopy } from "../copy/copy";
 
 const UPDATE_SCRIPT_NAME = "update.sh";

package/src/configFile.ts

@@ -6,7 +6,7 @@ import { promptSaveSlot } from "./commands/init/promptSaveSlot";
 import { CONFIG_FILE_NAME, CONFIG_FILE_PATH, CWD } from "./constants";
 import * as file from "./file";
 import { Config } from "./types/Config";
-import { error } from "./util";
+import { error } from "./utils";
 
 export async function get(argv: Record<string, unknown>): Promise<Config> {
   const verbose = argv.verbose === true;

package/src/exec.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { execSync, spawnSync, SpawnSyncReturns } from "child_process";
 import { CWD } from "./constants";
-import { error } from "./util";
+import { error } from "./utils";
 
 export function execExe(path: string, verbose = false, cwd = CWD): string {
   if (verbose) {

package/src/file.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import fs from "fs-extra";
 import path from "path";
-import { error } from "./util";
+import { error } from "./utils";
 
 export function copy(srcPath: string, dstPath: string, verbose: boolean): void {
   if (verbose) {

package/src/main.ts

@@ -18,7 +18,7 @@ import { parseArgs } from "./parseArgs";
 import { promptInit } from "./prompt";
 import { Command, DEFAULT_COMMAND } from "./types/Command";
 import { Config } from "./types/Config";
-import { ensureAllCases, error } from "./util";
+import { ensureAllCases, error } from "./utils";
 import { validateInIsaacScriptProject } from "./validateInIsaacScriptProject";
 import { validateNodeVersion } from "./validateNodeVersion";
 import { validateOS } from "./validateOS";

package/src/parseArgs.ts

@@ -20,11 +20,6 @@ export function parseArgs() {
           choices: [1, 2, 3],
           description: "The save slot in-game that you use",
         })
-        .option("crash-debug", {
-          alias: "c",
-          type: "boolean",
-          description: "Enable crash debugging",
-        })
         .option("verbose", {
           alias: "v",
           type: "boolean",

package/src/prompt.ts

@@ -4,7 +4,7 @@
 
 import chalk from "chalk";
 import prompt from "prompt";
-import { error, parseIntSafe } from "./util";
+import { error, parseIntSafe } from "./utils";
 
 const VALID_YES_RESPONSES = new Set(["yes", "ye", "y"]);
 const VALID_NO_RESPONSES = new Set(["no", "n"]);

package/src/{util.ts → utils.ts}

@@ -1,5 +1,5 @@
 import moment from "moment";
-import { CURRENT_DIRECTORY_NAME } from "./constants";
+import { CURRENT_DIRECTORY_NAME, CUSTOM_NODE_JS_STACK_SIZE } from "./constants";
 import { Config } from "./types/Config";
 
 export const ensureAllCases = (obj: never): never => obj;
@@ -19,6 +19,21 @@ export function getTime(): string {
   return moment().format("h:mm:ss A"); // e.g. "1:23:45 AM"
 }
 
+export function getTSTLArgs(watch: boolean): string[] {
+  // We cannot pass the "--stack-size" flag to the "npx" command
+  // Thus, we must execute node directly with the following arguments
+  const tstlArgs = [
+    `--stack-size=${CUSTOM_NODE_JS_STACK_SIZE}`,
+    "node_modules/@zamiell/typescript-to-lua/dist/tstl.js",
+  ];
+
+  if (watch) {
+    tstlArgs.push("--watch", "--preserveWatchOutput");
+  }
+
+  return tstlArgs;
+}
+
 // From: https://stackoverflow.com/questions/1731190/check-if-a-string-has-white-space
 export function hasWhiteSpace(s: string): boolean {
   return /\s/g.test(s);

package/src/validateNodeVersion.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import { PROJECT_NAME } from "./constants";
-import { parseSemVer } from "./util";
+import { parseSemVer } from "./utils";
 
 const REQUIRED_NODE_JS_MAJOR_VERSION = 16;
 

package/dist/src/util.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,2CAAqD;AAG9C,MAAM,cAAc,GAAG,CAAC,GAAU,EAAS,EAAE,CAAC,GAAG,CAAC;AAA5C,QAAA,cAAc,kBAA8B;AAEzD,SAAgB,KAAK,CAAC,GAAG,IAAe;IACtC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAHD,sBAGC;AAED,SAAgB,yBAAyB,CAAC,MAAc;IACtD,OAAO,MAAM,CAAC,4BAA4B,KAAK,SAAS;QACtD,CAAC,CAAC,kCAAsB;QACxB,CAAC,CAAC,MAAM,CAAC,4BAA4B,CAAC;AAC1C,CAAC;AAJD,8DAIC;AAED,SAAgB,OAAO;IACrB,OAAO,IAAA,gBAAM,GAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB;AAC3D,CAAC;AAFD,0BAEC;AAED,sFAAsF;AACtF,SAAgB,aAAa,CAAC,CAAS;IACrC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACvB,CAAC;AAFD,sCAEC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,GAAG,CAAC;KACZ;IAED,6CAA6C;IAC7C,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAEhC,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtD,IAAI,gBAAgB,EAAE;QACpB,uEAAuE;QACvE,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1C;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;QACvC,2CAA2C;QAC3C,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,gBAAgB,EAAE;QACpB,kCAAkC;QAClC,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;KACnC;IAED,OAAO,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAzBD,oCAyBC;AAED,SAAgB,WAAW,CACzB,aAAqB;IAErB,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5D,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,KAAK,CAAC,0CAA0C,aAAa,EAAE,CAAC,CAAC;KAClE;IAED,MAAM,CAAC,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC;IAE7E,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QAC9B,KAAK,CAAC,kDAAkD,aAAa,EAAE,CAAC,CAAC;KAC1E;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QAC9B,KAAK,CAAC,kDAAkD,aAAa,EAAE,CAAC,CAAC;KAC1E;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;QAC9B,KAAK,CAAC,kDAAkD,aAAa,EAAE,CAAC,CAAC;KAC1E;IAED,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC;AA1BD,kCA0BC"}