@flint.fyi/ts 0.13.1 → 0.14.0

package/src/index.ts

@@ -1,2 +1,3 @@
-export { typescriptLanguage } from "./language.js";
+export { getTSNodeRange } from "./getTSNodeRange.js";
+export * from "./language.js";
 export { ts } from "./plugin.js";

package/src/language.ts

@@ -12,6 +12,7 @@ import * as ts from "typescript";
 import { createTypeScriptFileFromProgram } from "./createTypeScriptFileFromProgram.js";
 import { createTypeScriptFileFromProjectService } from "./createTypeScriptFileFromProjectService.js";
 import { TSNodesByName } from "./nodes.js";
+import { prepareTypeScriptFile } from "./prepareTypeScriptFile.js";
 
 const log = debugForFile(import.meta.filename);
 
@@ -84,18 +85,21 @@ export const typescriptLanguage = createLanguage<
 		});
 
 		return {
-			prepareFileOnDisk: (filePathAbsolute) => {
+			prepareFromDisk: (filePathAbsolute) => {
 				const program = servicePrograms.get(filePathAbsolute);
 
 				seenPrograms.add(program);
 
-				return createTypeScriptFileFromProjectService(
-					filePathAbsolute,
-					program,
-					service,
-				);
+				const { languageFile, sourceFile } =
+					createTypeScriptFileFromProjectService(
+						filePathAbsolute,
+						program,
+						service,
+					);
+
+				return prepareTypeScriptFile(languageFile, sourceFile);
 			},
-			prepareFileVirtually: (filePathAbsolute, sourceText) => {
+			prepareFromVirtual: (filePathAbsolute, sourceText) => {
 				const environment = environments.get(filePathAbsolute);
 				environment.updateFile(filePathAbsolute, sourceText);
 				/* eslint-disable @typescript-eslint/no-non-null-assertion */
@@ -105,7 +109,12 @@ export const typescriptLanguage = createLanguage<
 
 				seenPrograms.add(program);
 
-				return createTypeScriptFileFromProgram(program, sourceFile);
+				const languageFile = createTypeScriptFileFromProgram(
+					program,
+					sourceFile,
+				);
+
+				return prepareTypeScriptFile(languageFile, sourceFile);
 			},
 		};
 	},

package/src/plugin.ts

@@ -5,7 +5,7 @@ import forInArrays from "./rules/forInArrays.js";
 import namespaceDeclarations from "./rules/namespaceDeclarations.js";
 
 export const ts = createPlugin({
-	globs: {
+	files: {
 		all: ["**/*.{cjs,js,jsx,mjs,ts,tsx}"],
 	},
 	name: "ts",

package/src/prepareTypeScriptFile.ts

@@ -0,0 +1,14 @@
+import { LanguageFileDefinition } from "@flint.fyi/core";
+import ts from "typescript";
+
+import { parseDirectivesFromTypeScriptFile } from "./directives/parseDirectivesFromTypeScriptFile.js";
+
+export function prepareTypeScriptFile(
+	languageFile: LanguageFileDefinition,
+	sourceFile: ts.SourceFile,
+) {
+	return {
+		...parseDirectivesFromTypeScriptFile(sourceFile),
+		file: languageFile,
+	};
+}

package/src/rules/consecutiveNonNullAssertions.ts

@@ -19,24 +19,26 @@ export default typescriptLanguage.createRule({
 	},
 	setup(context) {
 		return {
-			NonNullExpression(node) {
-				if (node.parent.kind !== ts.SyntaxKind.NonNullExpression) {
-					return;
-				}
+			visitors: {
+				NonNullExpression: (node) => {
+					if (node.parent.kind !== ts.SyntaxKind.NonNullExpression) {
+						return;
+					}
 
-				const range = {
-					begin: node.end,
-					end: node.parent.end + 1,
-				};
+					const range = {
+						begin: node.end,
+						end: node.parent.end + 1,
+					};
 
-				context.report({
-					fix: {
+					context.report({
+						fix: {
+							range,
+							text: "",
+						},
+						message: "consecutiveNonNullAssertion",
 						range,
-						text: "",
-					},
-					message: "consecutiveNonNullAssertion",
-					range,
-				});
+					});
+				},
 			},
 		};
 	},

package/src/rules/forInArrays.ts

@@ -46,21 +46,23 @@ export default typescriptLanguage.createRule({
 		}
 
 		return {
-			ForInStatement(node) {
-				const type = getConstrainedTypeAtLocation(
-					node.expression,
-					context.typeChecker,
-				);
+			visitors: {
+				ForInStatement: (node) => {
+					const type = getConstrainedTypeAtLocation(
+						node.expression,
+						context.typeChecker,
+					);
 
-				if (isArrayLike(type)) {
-					context.report({
-						message: "forIn",
-						range: {
-							begin: node.getStart(),
-							end: node.statement.getStart() - 1,
-						},
-					});
-				}
+					if (isArrayLike(type)) {
+						context.report({
+							message: "forIn",
+							range: {
+								begin: node.getStart(),
+								end: node.statement.getStart() - 1,
+							},
+						});
+					}
+				},
 			},
 		};
 	},

package/src/rules/namespaceDeclarations.ts

@@ -2,7 +2,7 @@ import * as tsutils from "ts-api-utils";
 import * as ts from "typescript";
 import { z } from "zod";
 
-import { getNodeRange } from "../getNodeRange.js";
+import { getTSNodeRange } from "../getTSNodeRange.js";
 import { typescriptLanguage } from "../language.js";
 
 export default typescriptLanguage.createRule({
@@ -32,26 +32,31 @@ export default typescriptLanguage.createRule({
 		}
 
 		return {
-			ModuleDeclaration(node) {
-				if (
-					node.parent.kind !== ts.SyntaxKind.SourceFile ||
-					node.name.kind !== ts.SyntaxKind.Identifier ||
-					node.name.text === "global"
-				) {
-					return;
-				}
+			visitors: {
+				ModuleDeclaration: (node) => {
+					if (
+						node.parent.kind !== ts.SyntaxKind.SourceFile ||
+						node.name.kind !== ts.SyntaxKind.Identifier ||
+						node.name.text === "global"
+					) {
+						return;
+					}
 
-				if (
-					allowDeclarations &&
-					tsutils.includesModifier(node.modifiers, ts.SyntaxKind.DeclareKeyword)
-				) {
-					return;
-				}
+					if (
+						allowDeclarations &&
+						tsutils.includesModifier(
+							node.modifiers,
+							ts.SyntaxKind.DeclareKeyword,
+						)
+					) {
+						return;
+					}
 
-				context.report({
-					message: "preferModules",
-					range: getNodeRange(node.getChildAt(0), context.sourceFile),
-				});
+					context.report({
+						message: "preferModules",
+						range: getTSNodeRange(node.getChildAt(0), context.sourceFile),
+					});
+				},
 			},
 		};
 	},