Upgrade TypeScript to 4.4 (#1138)

Perryvw · web-flow · commit 0bfdaf5c2673 · 2021-09-14T18:09:30.000+02:00
* Upgrade TypeScript to 4.4

* Add back direct dependency to ts

* Add assert to test runner

* Removed unused import

* fix assert issue again
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -68,7 +68,9 @@ module.exports = {
 
         "jest/expect-expect": "off",
         "jest/consistent-test-it": ["error", { fn: "test", withinDescribe: "test" }],
+        "jest/no-disabled-tests": "error",
         "jest/no-expect-resolves": "error",
+        "jest/no-identical-title": "off",
         "jest/no-test-return-statement": "error",
         "jest/no-truthy-falsy": "error",
         "jest/prefer-spy-on": "error",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,23 +41,26 @@
     "engines": {
         "node": ">=12.13.0"
     },
+    "peerDependencies": {
+        "typescript": "~4.4.3"
+    },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",
         "source-map": "^0.7.3",
-        "typescript": "~4.3.5"
+        "typescript": "~4.4.3"
     },
     "devDependencies": {
         "@types/fs-extra": "^8.1.0",
         "@types/glob": "^7.1.1",
         "@types/jest": "^25.1.3",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^4.26.1",
-        "@typescript-eslint/parser": "^4.26.1",
-        "eslint": "^7.28.0",
-        "eslint-plugin-import": "^2.20.1",
-        "eslint-plugin-jest": "^23.8.2",
+        "@typescript-eslint/eslint-plugin": "^4.31.0",
+        "@typescript-eslint/parser": "^4.31.0",
+        "eslint": "^7.32.0",
+        "eslint-plugin-import": "^2.24.2",
+        "eslint-plugin-jest": "^24.4.0",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
         "jest": "^26.0.1",
@@ -66,6 +69,6 @@
         "lua-wasm-bindings": "^0.2.2",
         "prettier": "^2.3.2",
         "ts-jest": "^26.3.0",
-        "ts-node": "^8.6.2"
+        "ts-node": "^10.2.1"
     }
 }
diff --git a/src/lualib/Symbol.ts b/src/lualib/Symbol.ts
@@ -5,7 +5,7 @@ const ____symbolMetatable = {
 };
 
 function __TS__Symbol(this: void, description?: string | number): symbol {
-    return setmetatable({ description }, ____symbolMetatable) as symbol;
+    return setmetatable({ description }, ____symbolMetatable) as unknown as symbol;
 }
 
 Symbol = {
diff --git a/src/transpilation/utils.ts b/src/transpilation/utils.ts
@@ -46,11 +46,13 @@ export function resolvePlugin(
         return { error: cliDiagnostics.compilerOptionRequiresAValueOfType(optionName, "string") };
     }
 
+    const isModuleNotFoundError = (error: any) => error.code === "MODULE_NOT_FOUND";
+
     let resolved: string;
     try {
         resolved = resolve.sync(query, { basedir, extensions: [".js", ".ts", ".tsx"] });
     } catch (err) {
-        if (err.code !== "MODULE_NOT_FOUND") throw err;
+        if (!isModuleNotFoundError(err)) throw err;
         return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };
     }
 
@@ -61,7 +63,7 @@ export function resolvePlugin(
             const tsNode: typeof import("ts-node") = require(tsNodePath);
             tsNode.register({ transpileOnly: true });
         } catch (err) {
-            if (err.code !== "MODULE_NOT_FOUND") throw err;
+            if (!isModuleNotFoundError(err)) throw err;
             return { error: diagnosticFactories.toLoadItShouldBeTranspiled(kind, query) };
         }
     }
diff --git a/test/unit/builtins/numbers.spec.ts b/test/unit/builtins/numbers.spec.ts
@@ -22,6 +22,8 @@ test.each([
     util.testExpression(code).expectToMatchJsResult();
 });
 
+// Current implementation does not allow this
+// eslint-disable-next-line jest/no-disabled-tests
 test.skip.each(["NaN", "Infinity"])("%s reassignment", name => {
     util.testFunction`
         const ${name} = 1;
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -6,6 +6,8 @@ test("throwString", () => {
     `.expectToEqual(new util.ExecutionError("Some Error"));
 });
 
+// TODO: Finally does not behave like it should, see #1137
+// eslint-disable-next-line jest/no-disabled-tests
 test.skip.each([0, 1, 2])("re-throw (%p)", i => {
     util.testFunction`
         const i: number = ${i};
diff --git a/test/unit/functions/validation/__snapshots__/invalidFunctionAssignments.spec.ts.snap b/test/unit/functions/validation/__snapshots__/invalidFunctionAssignments.spec.ts.snap
@@ -1538,9 +1538,10 @@ main.ts(4,24): error TSTL: Unable to convert function with no 'this' parameter t
 
 exports[`Invalid function tuple assignment: diagnostics 1`] = `
 "main.ts(5,13): error TS2322: Type '[number, Meth]' is not assignable to type '[number, Func]'.
-  Type 'Meth' is not assignable to type 'Func'.
-    The 'this' types of each signature are incompatible.
-      Type 'void' is not assignable to type '{}'.
+  Type at position 1 in source is not compatible with type at position 1 in target.
+    Type 'Meth' is not assignable to type 'Func'.
+      The 'this' types of each signature are incompatible.
+        Type 'void' is not assignable to type '{}'.
 main.ts(5,38): error TSTL: Unable to convert function with a 'this' parameter to function with no 'this'. To fix, wrap in an arrow function, or declare with 'this: void'."
 `;
 
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -467,8 +467,12 @@ describe("for...of empty destructuring", () => {
         });
     };
 
-    describe("declaration", () => declareTests("const "));
-    describe("assignment", () => declareTests(""));
+    describe("declaration", () => {
+        declareTests("const ");
+    });
+    describe("assignment", () => {
+        declareTests("");
+    });
 });
 
 for (const testCase of [
diff --git a/test/util.ts b/test/util.ts
@@ -491,6 +491,8 @@ end)());`;
         try {
             result = vm.runInContext(this.getJsCodeWithWrapper(), globalContext);
         } catch (error) {
+            const hasMessage = (error: any): error is { message: string } => error.message !== undefined;
+            assert(hasMessage(error));
             return new ExecutionError(error.message);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const ____symbolMetatable = {`
`5`	`5`	`};`
`6`	`6`
`7`	`7`	`function __TS__Symbol(this: void, description?: string \| number): symbol {`
`8`		`- return setmetatable({ description }, ____symbolMetatable) as symbol;`
	`8`	`+ return setmetatable({ description }, ____symbolMetatable) as unknown as symbol;`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`Symbol = {`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,13 @@ export function resolvePlugin(`
`46`	`46`	`return { error: cliDiagnostics.compilerOptionRequiresAValueOfType(optionName, "string") };`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ const isModuleNotFoundError = (error: any) => error.code === "MODULE_NOT_FOUND";`
	`50`	`+`
`49`	`51`	`let resolved: string;`
`50`	`52`	`try {`
`51`	`53`	`resolved = resolve.sync(query, { basedir, extensions: [".js", ".ts", ".tsx"] });`
`52`	`54`	`} catch (err) {`
`53`		`- if (err.code !== "MODULE_NOT_FOUND") throw err;`
	`55`	`+ if (!isModuleNotFoundError(err)) throw err;`
`54`	`56`	`return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };`
`55`	`57`	`}`
`56`	`58`
`@@ -61,7 +63,7 @@ export function resolvePlugin(`
`61`	`63`	`const tsNode: typeof import("ts-node") = require(tsNodePath);`
`62`	`64`	`tsNode.register({ transpileOnly: true });`
`63`	`65`	`} catch (err) {`
`64`		`- if (err.code !== "MODULE_NOT_FOUND") throw err;`
	`66`	`+ if (!isModuleNotFoundError(err)) throw err;`
`65`	`67`	`return { error: diagnosticFactories.toLoadItShouldBeTranspiled(kind, query) };`
`66`	`68`	`}`
`67`	`69`	`}`
Original file line number	Diff line number	Diff line change
@@ -491,6 +491,8 @@ end)());`;
`491`	`491`	`try {`
`492`	`492`	`result = vm.runInContext(this.getJsCodeWithWrapper(), globalContext);`
`493`	`493`	`} catch (error) {`
	`494`	`+ const hasMessage = (error: any): error is { message: string } => error.message !== undefined;`
	`495`	`+ assert(hasMessage(error));`
`494`	`496`	`return new ExecutionError(error.message);`
`495`	`497`	`}`
`496`	`498`