isaacscript 1.1.48 → 1.1.52

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "isaacscript",
-    "version": "1.1.48",
+    "version": "1.1.52",
     "description": "A command line tool for managing Isaac mods written in TypeScript",
     "homepage": "https://isaacscript.github.io/",
     "bugs": {
@@ -27,20 +27,20 @@
         "prompts": "^2.4.2",
         "source-map-support": "^0.5.21",
         "sync-directory": "^4.0.7",
-        "typescript": "4.5.2",
-        "typescript-to-lua": "^1.2.0",
+        "typescript": "4.4.4",
+        "typescript-to-lua": "1.1.1",
         "update-notifier": "^5.1.0",
-        "yargs": "^17.2.1"
+        "yargs": "^17.3.0"
     },
     "devDependencies": {
         "@types/command-exists": "^1.2.0",
         "@types/figlet": "^1.5.4",
         "@types/fs-extra": "^9.0.13",
-        "@types/node": "^16.11.10",
+        "@types/node": "^16.11.11",
         "@types/prompts": "^2.0.14",
         "@types/source-map-support": "^0.5.4",
         "@types/update-notifier": "^5.1.0",
         "@types/yargs": "^17.0.7",
-        "isaacscript-lint": "^1.0.68"
+        "isaacscript-lint": "^1.0.72"
     }
 }

package/dist/src/monkeyPatch.js

@@ -42,6 +42,20 @@ see the official website: https://isaacscript.github.io/
 --]]
 
 `;
+const MAIN_LUA_REPLACEMENTS = [
+    // For TSTL v1.2.0
+    /*
+    ["WeakMap = __TS__Class()", "WeakMap = WeakMap or __TS__Class()"],
+    ["WeakSet = __TS__Class()", "WeakSet = WeakSet or __TS__Class()"],
+    ["Map = __TS__Class()", "Map = Map or __TS__Class()"],
+    "Set = __TS__Class()", "Set = Set or __TS__Class()"],
+    */
+    // For TSTL v1.1.1
+    ["WeakMap = (function", "WeakMap = WeakMap or (function"],
+    ["WeakSet = (function", "WeakSet = WeakSet or (function"],
+    ["Map = (function", "Map = Map or (function"],
+    ["Set = (function", "Set = Set or (function"],
+];
 function monkeyPatchMainLua(targetModDirectory) {
     const mainLuaPath = path_1.default.join(targetModDirectory, constants_1.MAIN_LUA);
     let mainLua = file.read(mainLuaPath);
@@ -61,10 +75,9 @@ function patchInformationalHeader(mainLua) {
 // at the transpiled Lua code
 function patchGlobalObjects(originalMainLua) {
     let mainLua = originalMainLua;
-    mainLua = mainLua.replace("WeakMap = (function", "WeakMap = WeakMap or (function");
-    mainLua = mainLua.replace("WeakSet = (function", "WeakSet = WeakSet or (function");
-    mainLua = mainLua.replace("Map = (function", "Map = Map or (function");
-    mainLua = mainLua.replace("Set = (function", "Set = Set or (function");
+    for (const [findString, replaceString] of MAIN_LUA_REPLACEMENTS) {
+        mainLua = mainLua.replace(findString, replaceString);
+    }
     return mainLua;
 }
 //# sourceMappingURL=monkeyPatch.js.map

package/dist/src/monkeyPatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"monkeyPatch.js","sourceRoot":"","sources":["../../src/monkeyPatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,2CAAuC;AACvC,6CAA+B;AAE/B,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;CAe5B,CAAC;AAEF,SAAgB,kBAAkB,CAAC,kBAA0B;IAC3D,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,oBAAQ,CAAC,CAAC;IAC5D,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAErC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAEtC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AARD,gDAQC;AAED,kFAAkF;AAClF,SAAS,wBAAwB,CAAC,OAAe;IAC/C,OAAO,oBAAoB,GAAG,OAAO,CAAC;AACxC,CAAC;AAED,2EAA2E;AAC3E,mFAAmF;AACnF,oDAAoD;AACpD,kGAAkG;AAClG,6BAA6B;AAC7B,SAAS,kBAAkB,CAAC,eAAuB;IACjD,IAAI,OAAO,GAAG,eAAe,CAAC;IAE9B,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,qBAAqB,EACrB,gCAAgC,CACjC,CAAC;IACF,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,qBAAqB,EACrB,gCAAgC,CACjC,CAAC;IACF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,CAAC;IACvE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,CAAC;IAEvE,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"monkeyPatch.js","sourceRoot":"","sources":["../../src/monkeyPatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,2CAAuC;AACvC,6CAA+B;AAE/B,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;CAe5B,CAAC;AAEF,MAAM,qBAAqB,GAAG;IAC5B,kBAAkB;IAClB;;;;;MAKE;IAEF,kBAAkB;IAClB,CAAC,qBAAqB,EAAE,gCAAgC,CAAC;IACzD,CAAC,qBAAqB,EAAE,gCAAgC,CAAC;IACzD,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;CAC9C,CAAC;AAEF,SAAgB,kBAAkB,CAAC,kBAA0B;IAC3D,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,oBAAQ,CAAC,CAAC;IAC5D,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAErC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAEtC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AARD,gDAQC;AAED,kFAAkF;AAClF,SAAS,wBAAwB,CAAC,OAAe;IAC/C,OAAO,oBAAoB,GAAG,OAAO,CAAC;AACxC,CAAC;AAED,2EAA2E;AAC3E,mFAAmF;AACnF,oDAAoD;AACpD,kGAAkG;AAClG,6BAA6B;AAC7B,SAAS,kBAAkB,CAAC,eAAuB;IACjD,IAAI,OAAO,GAAG,eAAe,CAAC;IAE9B,KAAK,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,qBAAqB,EAAE;QAC/D,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;KACtD;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/file-templates/static/lint.sh

@@ -25,6 +25,6 @@ npx eslint --max-warnings 0 src
 # Step 2 - Spell check every file using cspell
 # We use no-progress and no-summary because we want to only output errors
 npx cspell --no-progress --no-summary "src/**/*.ts"
-npx cspell --no-progress --no-summary "mods/metadata.xml"
+npx cspell --no-progress --no-summary "mod/metadata.xml"
 
 echo "Successfully linted in $SECONDS seconds."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript",
-  "version": "1.1.48",
+  "version": "1.1.52",
   "description": "A command line tool for managing Isaac mods written in TypeScript",
   "homepage": "https://isaacscript.github.io/",
   "bugs": {
@@ -27,20 +27,20 @@
     "prompts": "^2.4.2",
     "source-map-support": "^0.5.21",
     "sync-directory": "^4.0.7",
-    "typescript": "4.5.2",
-    "typescript-to-lua": "^1.2.0",
+    "typescript": "4.4.4",
+    "typescript-to-lua": "1.1.1",
     "update-notifier": "^5.1.0",
-    "yargs": "^17.2.1"
+    "yargs": "^17.3.0"
   },
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/figlet": "^1.5.4",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^16.11.10",
+    "@types/node": "^16.11.11",
     "@types/prompts": "^2.0.14",
     "@types/source-map-support": "^0.5.4",
     "@types/update-notifier": "^5.1.0",
     "@types/yargs": "^17.0.7",
-    "isaacscript-lint": "^1.0.68"
+    "isaacscript-lint": "^1.0.72"
   }
 }

package/src/commands/init/init.ts

@@ -46,7 +46,7 @@ export async function init(argv: Record<string, unknown>): Promise<void> {
 }
 
 function getVSCodeCommand() {
-  for (const VSCodeCommand of ["code", "codium", "code-oss"]) {
+  for (const VSCodeCommand of ["code", "codium", "code-oss", "code-insiders"]) {
     if (commandExists.sync(VSCodeCommand)) {
       return VSCodeCommand;
     }

package/src/monkeyPatch.ts

@@ -19,6 +19,22 @@ see the official website: https://isaacscript.github.io/
 
 `;
 
+const MAIN_LUA_REPLACEMENTS = [
+  // For TSTL v1.2.0
+  /*
+  ["WeakMap = __TS__Class()", "WeakMap = WeakMap or __TS__Class()"],
+  ["WeakSet = __TS__Class()", "WeakSet = WeakSet or __TS__Class()"],
+  ["Map = __TS__Class()", "Map = Map or __TS__Class()"],
+  "Set = __TS__Class()", "Set = Set or __TS__Class()"],
+  */
+
+  // For TSTL v1.1.1
+  ["WeakMap = (function", "WeakMap = WeakMap or (function"],
+  ["WeakSet = (function", "WeakSet = WeakSet or (function"],
+  ["Map = (function", "Map = Map or (function"],
+  ["Set = (function", "Set = Set or (function"],
+];
+
 export function monkeyPatchMainLua(targetModDirectory: string): void {
   const mainLuaPath = path.join(targetModDirectory, MAIN_LUA);
   let mainLua = file.read(mainLuaPath);
@@ -42,16 +58,9 @@ function patchInformationalHeader(mainLua: string) {
 function patchGlobalObjects(originalMainLua: string) {
   let mainLua = originalMainLua;
 
-  mainLua = mainLua.replace(
-    "WeakMap = (function",
-    "WeakMap = WeakMap or (function",
-  );
-  mainLua = mainLua.replace(
-    "WeakSet = (function",
-    "WeakSet = WeakSet or (function",
-  );
-  mainLua = mainLua.replace("Map = (function", "Map = Map or (function");
-  mainLua = mainLua.replace("Set = (function", "Set = Set or (function");
+  for (const [findString, replaceString] of MAIN_LUA_REPLACEMENTS) {
+    mainLua = mainLua.replace(findString, replaceString);
+  }
 
   return mainLua;
 }

package/update.sh

@@ -10,7 +10,7 @@ cd "$DIR"
 
 PACKAGE_JSON="$DIR/package.json"
 OLD_HASH=$(md5sum "$PACKAGE_JSON")
-npx npm-check-updates --upgrade --packageFile "$PACKAGE_JSON" --reject chalk
+npx npm-check-updates --upgrade --packageFile "$PACKAGE_JSON" --reject chalk,typescript,typescript-to-lua
 NEW_HASH=$(md5sum "$PACKAGE_JSON")
 if [[ $OLD_HASH != $NEW_HASH ]]; then
   npm install