Support TypeScript 4.7 (roblox-ts#1903)

* Update validateCompilerOptions.ts

* Delete fileIsModule.ts

* Update getCustomPreEmitDiagnostics.ts

* Fix remaining import

* Update versions

* Fix getDiagnosticsProducingTypeChecker usage

* Update tsconfigs with moduleDetection option

* Remove unused noNonModule diagnostic and test

* Fix breaking type change from TS 4.7 in map test

* Update ts-expose-internals

* Update test types

* Use temporary override to fix ts-node dependency
ts-node requires peerDependency on stable TS versions only
so conflict is generated when 4.7.0-beta is used for main package.json
override only applies to devDependency, and...
...is only used on building the compiler locally, so it should be fine.

* Upgrade to stable TS, remove redundant override

* Pin typescript version to 4.7.2 only

* Remove `export {}`, format diagnostic tests

* Update test types again

* Bump ts-expose-internals back down to test CI

* Update ts-expose-internals to 4.7.2

Co-authored-by: osyrisrblx <[email protected]>

Author: Dionysusnu

package-lock.json

@@ -58,7 +58,7 @@
 		"lookpath": "^1.2.2",
 		"prompts": "^2.4.1",
 		"resolve": "^1.20.0",
-		"typescript": "=4.6.2",
+		"typescript": "=4.7.2",
 		"yargs": "^17.2.0"
 	},
 	"devDependencies": {
@@ -67,6 +67,7 @@
 		"@types/node": "^17.0.0",
 		"@types/prompts": "^2.0.14",
 		"@types/resolve": "^1.20.1",
+		"@types/ts-expose-internals": "npm:[email protected]",
 		"@types/yargs": "^17.0.3",
 		"@typescript-eslint/eslint-plugin": "^5.0.0",
 		"@typescript-eslint/parser": "^5.0.0",
@@ -78,8 +79,7 @@
 		"mocha": "^10.0.0",
 		"nyc": "^15.1.0",
 		"prettier": "^2.4.1",
-		"ts-expose-internals": "=4.6.4",
-		"ttypescript": "^1.5.12",
+		"ttypescript": "^1.5.13",
 		"typescript-transform-paths": "^3.3.1"
 	},
 	"files": [

package.json

@@ -105,7 +105,7 @@ export class VirtualProject {
 			.getFilePaths()
 			.filter(v => v.endsWith(ts.Extension.Ts) || v.endsWith(ts.Extension.Tsx) || v.endsWith(ts.Extension.Dts));
 		this.program = ts.createProgram(rootNames, this.compilerOptions, this.compilerHost, this.program);
-		this.typeChecker = this.program.getDiagnosticsProducingTypeChecker();
+		this.typeChecker = this.program.getTypeChecker();
 
 		const services = createTransformServices(this.program, this.typeChecker, this.data);
 		const pathTranslator = new PathTranslator(ROOT_DIR, OUT_DIR, undefined, false);

src/Project/classes/VirtualProject.ts

@@ -163,7 +163,7 @@ export function compileFiles(
 
 	if (DiagnosticService.hasErrors()) return { emitSkipped: true, diagnostics: DiagnosticService.flush() };
 
-	const typeChecker = proxyProgram.getDiagnosticsProducingTypeChecker();
+	const typeChecker = proxyProgram.getTypeChecker();
 	const services = createTransformServices(proxyProgram, typeChecker, data);
 
 	for (let i = 0; i < sourceFiles.length; i++) {

src/Project/functions/compileFiles.ts

@@ -7,6 +7,7 @@ import ts from "typescript";
 const ENFORCED_OPTIONS = {
 	target: ts.ScriptTarget.ESNext,
 	module: ts.ModuleKind.CommonJS,
+	moduleDetection: ts.ModuleDetectionKind.Force,
 	moduleResolution: ts.ModuleResolutionKind.NodeJs,
 	noLib: true,
 	strict: true,
@@ -48,6 +49,10 @@ export function validateCompilerOptions(opts: ts.CompilerOptions, nodeModulesPat
 		errors.push(`${y(`"module"`)} must be ${y(`commonjs`)}`);
 	}
 
+	if (opts.moduleDetection !== ENFORCED_OPTIONS.moduleDetection) {
+		errors.push(`${y(`"moduleDetection"`)} must be ${y(`"force"`)}`);
+	}
+
 	if (opts.moduleResolution !== ENFORCED_OPTIONS.moduleResolution) {
 		errors.push(`${y(`"moduleResolution"`)} must be ${y(`"Node"`)}`);
 	}

src/Project/functions/validateCompilerOptions.ts

@@ -1,8 +1,7 @@
-import { fileIsModule } from "TSTransformer/preEmitDiagnostics/fileIsModule";
 import ts from "typescript";
 
 export type PreEmitChecker = (sourceFile: ts.SourceFile) => Array<ts.Diagnostic>;
-const PRE_EMIT_DIAGNOSTICS: Array<PreEmitChecker> = [fileIsModule];
+const PRE_EMIT_DIAGNOSTICS: Array<PreEmitChecker> = [];
 
 export function getCustomPreEmitDiagnostics(sourceFile: ts.SourceFile) {
 	const diagnostics = new Array<ts.Diagnostic>();

src/Project/util/getCustomPreEmitDiagnostics.ts

@@ -175,11 +175,6 @@ export const errors = {
 	noVarArgsMacroSpread: error("Macros which use variadric arguments do not support spread expressions!", issue(1149)),
 
 	// import/export
-	noNonModule: error(
-		"File does not have an import or export statement!",
-		suggestion("Add `export {};` as the first line."),
-		issue(1043),
-	),
 	noModuleSpecifierFile: error("Could not find file for import. Did you forget to `npm install`?"),
 	noInvalidModule: error("You can only use npm scopes that are listed in your typeRoots."),
 	noUnscopedModule: error("You cannot use modules directly under node_modules."),

src/Shared/diagnostics.ts

@@ -1,3 +1 @@
-export {};
-
 print("Hello from model!");

src/TSTransformer/preEmitDiagnostics/fileIsModule.ts

@@ -1,7 +1,5 @@
 /// <reference types="@rbxts/types/plugin" />
 
-export {};
-
 const toolbar = plugin.CreateToolbar("MyToolbar");
 const button = toolbar.CreateButton("MyButton", "", "");
 

templates/model/src/index.server.ts

@@ -12,6 +12,7 @@
 		"resolveJsonModule": true,
 		"experimentalDecorators": true,
 		"forceConsistentCasingInFileNames": true,
+		"moduleDetection": "force",
 		"strict": true,
 		"target": "ESNext",
 		"typeRoots": ["node_modules/@rbxts"],

templates/plugin/src/index.server.ts

@@ -12,6 +12,7 @@
 		"resolveJsonModule": true,
 		"experimentalDecorators": true,
 		"forceConsistentCasingInFileNames": true,
+		"moduleDetection": "force",
 		"strict": true,
 		"target": "ESNext",
 		"typeRoots": ["node_modules/@rbxts"],

templates/tsconfig-default.json

@@ -10,10 +10,10 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"@rbxts/compiler-types": "^1.3.2-types.0",
+		"@rbxts/compiler-types": "^1.3.3-types.1",
 		"@rbxts/roact": "^1.3.0-ts.7",
 		"@rbxts/services": "^1.1.2",
 		"@rbxts/testez": "^0.3.1-ts.6",
-		"@rbxts/types": "^1.0.571"
+		"@rbxts/types": "^1.0.593"
 	}
 }

templates/tsconfig-package.json

@@ -1,9 +1,7 @@
-export {};
-
 interface HasCallback {
 	callback: () => void;
 }
 
 const obj: HasCallback = {
 	callback() {},
-}
+};

tests/package-lock.json

@@ -1,9 +1,7 @@
-export {};
-
 interface HasCallback {
 	callback: () => void;
 }
 
 const obj: HasCallback = {
-	callback: function() {},
-}
+	callback: function () {},
+};

tests/package.json

@@ -1,5 +1,3 @@
-export {};
-
 interface MyWow {
 	callback: () => void;
 }

tests/src/diagnostics/expectedFunctionGotMethod.1.ts

@@ -1,9 +1,7 @@
-export {};
-
 interface HasMethod {
 	method(): void;
 }
 
 const obj: HasMethod = {
 	method: () => {},
-}
+};

tests/src/diagnostics/expectedFunctionGotMethod.2.ts

@@ -1,9 +1,7 @@
-export {};
-
 interface HasMethod {
 	method: (this: HasMethod) => void;
 }
 
 const obj: HasMethod = {
 	method: () => {},
-}
+};

tests/src/diagnostics/expectedFunctionGotMethod.3.ts

@@ -1,5 +1,3 @@
-export {};
-
 interface HasMethod {
 	method(): void;
 }
@@ -8,4 +6,4 @@ function method() {}
 
 const obj: HasMethod = {
 	method,
-}
+};

tests/src/diagnostics/expectedMethodGotFunction.1.ts

@@ -1,9 +1,7 @@
-export {};
-
 interface HasMethod {
 	method(): void;
 }
 
 const obj: HasMethod = {
 	method(this: void) {},
-}
+};

tests/src/diagnostics/expectedMethodGotFunction.2.ts

@@ -1,5 +1,3 @@
-export {};
-
 interface MyWow {
 	method(): void;
 }

tests/src/diagnostics/expectedMethodGotFunction.3.ts

@@ -1,5 +1,3 @@
-export {};
-
 function foo(x: any) {
 	print(x.y);
 }

tests/src/diagnostics/expectedMethodGotFunction.4.ts

@@ -1,5 +1,3 @@
-export {};
-
 function foo() {
 	print(arguments);
 }

tests/src/diagnostics/expectedMethodGotFunction.5.ts

@@ -1,5 +1,3 @@
-export {};
-
 async function* foo() {
 	yield 1;
 }

tests/src/diagnostics/noAny.ts

@@ -1,5 +1,4 @@
-export {};
-
 async function foo() {
-	for await (const x of [1, 2, 3]) {}
+	for await (const x of [1, 2, 3]) {
+	}
 }

tests/src/diagnostics/noArguments.ts

@@ -1,3 +1 @@
-export {};
-
 print(1n);

tests/src/diagnostics/noAsyncGeneratorFunctions.ts

@@ -1,5 +1,3 @@
-export {};
-
 class X {
 	__tostring() {}
 }

tests/src/diagnostics/noAwaitForOf.ts

@@ -1,3 +1 @@
-export {};
-
 const x = (print(), 1);

tests/src/diagnostics/noBigInt.ts

@@ -1,3 +1 @@
-export {};
-
 print(Array);

tests/src/diagnostics/noClassMetamethods.ts

@@ -1,3 +1 @@
-export {};
-
 debugger;

tests/src/diagnostics/noComma.ts

@@ -1,6 +1,4 @@
-export {};
-
 let a: boolean;
 let b: string | void;
 
-print([a, b] = pcall(() => {}));
+print(([a, b] = pcall(() => {})));

tests/src/diagnostics/noConstructorMacroWithoutNew.ts

@@ -1,5 +1,3 @@
-export {};
-
 enum A {
 	a,
 }

tests/src/diagnostics/noDebuggerStatement.ts

@@ -1,3 +1 @@
-export {};
-
 print(false == false);

tests/src/diagnostics/noDestructureAssignmentExpression.ts

@@ -1,3 +1 @@
-export {};
-
 print(game.Archivable != false);

tests/src/diagnostics/noEnumMerging.ts

@@ -1,5 +1,3 @@
-export {};
-
 for (const x in game) {
 	print(x);
 }

tests/src/diagnostics/noEqualsEquals.ts

@@ -1,3 +1 @@
-export {};
-
-print(function foo() {})
+print(function foo() {});

tests/src/diagnostics/noExclamationEquals.ts

@@ -1,5 +1,3 @@
-export {};
-
 class X {
 	get x() {
 		return "x";

tests/src/diagnostics/noForInStatement.ts

@@ -1,5 +1,3 @@
-export {};
-
 class X {
 	set x(value: number) {}
 }

tests/src/diagnostics/noFunctionExpressionName.ts

@@ -1,3 +1 @@
-export {};
-
 print(globalThis);

tests/src/diagnostics/noGetterSetter.1.ts

@@ -1,3 +1 @@
-export {};
-
 game.ChildAdded.Connect(game.Destroy);

tests/src/diagnostics/noGetterSetter.2.ts

@@ -1,4 +1,2 @@
-export {};
-
 const array = [1, 2, 3];
 const x = array.push;

tests/src/diagnostics/noGlobalThis.ts

@@ -1,5 +1,3 @@
-export {};
-
 const array = [1, 2, 3];
 const { push } = array;
 const otherArray = [1, 2];

tests/src/diagnostics/noIndexWithoutCall.1.ts

@@ -1,3 +1 @@
-export {};
-
 const nil = 1;

tests/src/diagnostics/noIndexWithoutCall.2.ts

@@ -1,3 +1 @@
-export {};
-
 const $id = 1;