@flint.fyi/ts 0.23.1 → 0.23.2

package/dist/index.mjs

@@ -1686,9 +1686,7 @@ function isDirectEqualityCheck(node, operators, parameterName) {
 		case SyntaxKind.ArrowFunction:
 			body = node.body.kind === SyntaxKind.Block ? getDirectReturnExpression(node.body) : node.body;
 			break;
-		case SyntaxKind.FunctionExpression:
-			body = getDirectReturnExpression(node.body);
-			break;
+		case SyntaxKind.FunctionExpression: body = getDirectReturnExpression(node.body);
 	}
 	if (body?.kind !== SyntaxKind.BinaryExpression) return false;
 	const { left, operatorToken, right } = body;
@@ -2273,10 +2271,7 @@ var arrayTypes_default = ruleCreator.createRule(typescriptLanguage, {
 				if (node.parent.kind === SyntaxKind.TypeOperator && node.parent.operator === SyntaxKind.ReadonlyKeyword) return;
 				switch (options.style) {
 					case "array": return;
-					case "array-simple":
-						if (isSimpleType(node.elementType)) return;
-						break;
-					case "generic": break;
+					case "array-simple": if (isSimpleType(node.elementType)) return;
 				}
 				context.report({
 					message: "preferGenericSyntax",
@@ -2288,10 +2283,7 @@ var arrayTypes_default = ruleCreator.createRule(typescriptLanguage, {
 				const arrayType = node.type;
 				switch (options.style) {
 					case "array": return;
-					case "array-simple":
-						if (isSimpleType(arrayType.elementType)) return;
-						break;
-					case "generic": break;
+					case "array-simple": if (isSimpleType(arrayType.elementType)) return;
 				}
 				context.report({
 					message: "preferReadonlyGenericSyntax",
@@ -3053,9 +3045,7 @@ var catchCallbackTypes_default = ruleCreator.createRule(typescriptLanguage, {
 				case "catch":
 					if (node.arguments.length >= 1) checkCallbackParameter(node.arguments[0], sourceFile, typeChecker);
 					break;
-				case "then":
-					if (node.arguments.length >= 2) checkCallbackParameter(node.arguments[1], sourceFile, typeChecker);
-					break;
+				case "then": if (node.arguments.length >= 2) checkCallbackParameter(node.arguments[1], sourceFile, typeChecker);
 			}
 		} } };
 	}
@@ -3437,9 +3427,7 @@ var classMethodsThis_default = ruleCreator.createRule(typescriptLanguage, {
 				case SyntaxKind.PropertyDeclaration:
 					checkPropertyInitializerFunction(member, node, sourceFile, options);
 					break;
-				case SyntaxKind.SetAccessor:
-					checkAccessor(member, node, sourceFile, options, "setter");
-					break;
+				case SyntaxKind.SetAccessor: checkAccessor(member, node, sourceFile, options, "setter");
 			}
 		}
 		return { visitors: {
@@ -3894,12 +3882,10 @@ var dateNowTimestamps_default = ruleCreator.createRule(typescriptLanguage, {
 							range: getTSNodeRange(node.parent, sourceFile)
 						});
 						break;
-					case SyntaxKind.PrefixUnaryExpression:
-						if (node.parent.operator === SyntaxKind.MinusToken || node.parent.operator === SyntaxKind.PlusToken) context.report({
-							message: "preferDateNow",
-							range: getTSNodeRange(node, sourceFile)
-						});
-						break;
+					case SyntaxKind.PrefixUnaryExpression: if (node.parent.operator === SyntaxKind.MinusToken || node.parent.operator === SyntaxKind.PlusToken) context.report({
+						message: "preferDateNow",
+						range: getTSNodeRange(node, sourceFile)
+					});
 				}
 			}
 		} };
@@ -5859,9 +5845,7 @@ var exportUniqueNames_default = ruleCreator.createRule(typescriptLanguage, {
 				case SyntaxKind.ExportDeclaration:
 					checkExportDeclaration(statement);
 					break;
-				case SyntaxKind.VariableStatement:
-					checkVariableStatement(statement);
-					break;
+				case SyntaxKind.VariableStatement: checkVariableStatement(statement);
 			}
 		} } };
 	}
@@ -6001,7 +5985,6 @@ var fetchMethodBodies_default = ruleCreator.createRule(typescriptLanguage, {
 						case "method":
 							if (property.initializer.kind !== SyntaxKind.StringLiteral) return;
 							methodText = property.initializer.text;
-							break;
 					}
 					break;
 				case SyntaxKind.SpreadAssignment: return;
@@ -6750,9 +6733,7 @@ function getCalleeName(node) {
 			if (node.expression.kind === SyntaxKind.Identifier && globalCandidates.has(node.expression.text) && node.argumentExpression.kind === SyntaxKind.StringLiteral) return node.argumentExpression.text;
 			break;
 		case SyntaxKind.Identifier: return node.text;
-		case SyntaxKind.PropertyAccessExpression:
-			if (node.expression.kind === SyntaxKind.Identifier && globalCandidates.has(node.expression.text)) return node.name.text;
-			break;
+		case SyntaxKind.PropertyAccessExpression: if (node.expression.kind === SyntaxKind.Identifier && globalCandidates.has(node.expression.text)) return node.name.text;
 	}
 }
 function isBind(node) {
@@ -6842,9 +6823,7 @@ var impliedEvals_default = ruleCreator.createRule(typescriptLanguage, {
 					checkCalleeFunction(node, services);
 					break;
 				case void 0: return;
-				default:
-					checkCalleeEval(node, calleeName, services);
-					break;
+				default: checkCalleeEval(node, calleeName, services);
 			}
 		}
 		return { visitors: {
@@ -8604,13 +8583,11 @@ var nonNullAssertionPlacement_default = ruleCreator.createRule(typescriptLanguag
 						suggestions
 					});
 					break;
-				default:
-					context.report({
-						message: "confusingEqual",
-						range,
-						suggestions
-					});
-					break;
+				default: context.report({
+					message: "confusingEqual",
+					range,
+					suggestions
+				});
 			}
 		} } };
 	}
@@ -9254,12 +9231,10 @@ var numericErasingOperations_default = ruleCreator.createRule(typescriptLanguage
 						range: getTSNodeRange(node, sourceFile)
 					});
 					break;
-				case SyntaxKind.SlashToken:
-					if (isZeroLiteral(node.left) && !isZeroLiteral(node.right)) context.report({
-						message: "erasingOperation",
-						range: getTSNodeRange(node, sourceFile)
-					});
-					break;
+				case SyntaxKind.SlashToken: if (isZeroLiteral(node.left) && !isZeroLiteral(node.right)) context.report({
+					message: "erasingOperation",
+					range: getTSNodeRange(node, sourceFile)
+				});
 			}
 		} } };
 	}
@@ -11202,9 +11177,7 @@ function elementsToCharacterClass(elements) {
 		case "CharacterClassRange":
 		case "CharacterSet":
 		case "ClassStringDisjunction":
-		case "ExpressionCharacterClass":
-			parts.push(element.raw);
-			break;
+		case "ExpressionCharacterClass": parts.push(element.raw);
 	}
 	if (!parts.length) return "[]";
 	if (parts[0]?.[0] === "^") parts[0] = `\\${parts[0]}`;
@@ -11428,7 +11401,9 @@ function processCharacterClass(node) {
 		} else continue;
 		const group = groups.find((gp) => {
 			if (!(gp.min.value - 1 <= data.max.value && data.min.value <= gp.max.value + 1)) return false;
-			return inRange(ALPHANUMERIC_RANGES, Math.min(gp.min.value, data.min.value), Math.max(gp.max.value, data.max.value));
+			const min = Math.min(gp.min.value, data.min.value);
+			const max = Math.max(gp.max.value, data.max.value);
+			return inRange(ALPHANUMERIC_RANGES, min, max);
 		});
 		if (group) {
 			if (data.min.value < group.min.value) group.min = data.min;
@@ -12103,17 +12078,19 @@ function findIssues$2(pattern, flags) {
 		const groups = [];
 		for (const element of ccNode.elements) {
 			let data;
-			if (element.type === "Character") if (checkInAllowedRange(element.value)) data = {
-				max: element,
-				min: element
-			};
-			else continue;
-			else if (element.type === "CharacterClassRange") if (checkInAllowedRange(element.min.value, element.min.value, element.max.value)) data = {
-				max: element.max,
-				min: element.min
-			};
-			else continue;
-			else continue;
+			if (element.type === "Character") {
+				if (checkInAllowedRange(element.value)) data = {
+					max: element,
+					min: element
+				};
+				else continue;
+			} else if (element.type === "CharacterClassRange") {
+				if (checkInAllowedRange(element.min.value, element.min.value, element.max.value)) data = {
+					max: element.max,
+					min: element.min
+				};
+				else continue;
+			} else continue;
 			const group = groups.find((gp) => {
 				if (!(gp.min.value - 1 <= data.max.value && data.min.value <= gp.max.value + 1)) return false;
 				const min = Math.min(gp.min.value, data.min.value);
@@ -12456,9 +12433,10 @@ function findEmptyAlternativesInGroup(pattern, groupStart, groupEnd, results) {
 		"?!",
 		"?:",
 		"?="
-	].includes(pattern.slice(groupStart, groupStart + 2)) || ["?<!", "?<="].includes(pattern.slice(groupStart, groupStart + 3))) if (pattern.slice(groupStart, groupStart + 3).startsWith("?<")) contentStart = groupStart + 3;
-	else contentStart = groupStart + 2;
-	else if (pattern[groupStart] === "?" && pattern[groupStart + 1] === "<") {
+	].includes(pattern.slice(groupStart, groupStart + 2)) || ["?<!", "?<="].includes(pattern.slice(groupStart, groupStart + 3))) {
+		if (pattern.slice(groupStart, groupStart + 3).startsWith("?<")) contentStart = groupStart + 3;
+		else contentStart = groupStart + 2;
+	} else if (pattern[groupStart] === "?" && pattern[groupStart + 1] === "<") {
 		const closeAngle = pattern.indexOf(">", groupStart + 2);
 		if (closeAngle !== -1 && closeAngle < groupEnd) contentStart = closeAngle + 1;
 	}
@@ -12475,9 +12453,7 @@ function findEmptyAlternativesInGroup(pattern, groupStart, groupEnd, results) {
 		case "\\":
 			i++;
 			break;
-		case "|":
-			pipePositions.push(i);
-			break;
+		case "|": pipePositions.push(i);
 	}
 	if (!pipePositions.length) return;
 	const alternativeBoundaries = [];
@@ -12768,14 +12744,11 @@ function* extractLazyEndQuantifiers(alternatives) {
 			case "Group":
 				yield* extractLazyEndQuantifiers(last.alternatives);
 				break;
-			case "Quantifier":
-				if (!last.greedy && last.min !== last.max) yield last;
-				else if (last.max === 1) {
-					const element = last.element;
-					if (element.type === "Group" || element.type === "CapturingGroup") yield* extractLazyEndQuantifiers(element.alternatives);
-				}
-				break;
-			default: break;
+			case "Quantifier": if (!last.greedy && last.min !== last.max) yield last;
+			else if (last.max === 1) {
+				const element = last.element;
+				if (element.type === "Group" || element.type === "CapturingGroup") yield* extractLazyEndQuantifiers(element.alternatives);
+			}
 		}
 	}
 }
@@ -13233,9 +13206,10 @@ function simplifyCharacterClass(pattern, charClass) {
 	const elements = charClass.elements;
 	const keptCharacters = /* @__PURE__ */ new Set();
 	const rangesToKeep = [];
-	for (const element of elements) if (element.type === "Character") if (isLetter$1(element.value)) keptCharacters.add(toLowerCase(element.value));
-	else keptCharacters.add(element.value);
-	else if (element.type === "CharacterClassRange") {
+	for (const element of elements) if (element.type === "Character") {
+		if (isLetter$1(element.value)) keptCharacters.add(toLowerCase(element.value));
+		else keptCharacters.add(element.value);
+	} else if (element.type === "CharacterClassRange") {
 		const min = element.min.value;
 		const max = element.max.value;
 		const minIsUpper = min >= 65 && min <= 90;
@@ -13504,9 +13478,7 @@ function checkPattern(pattern, flags) {
 					checkHexadecimalEscape(charNode);
 					break;
 				case "unicode":
-				case "unicodeCodePoint":
-					checkUnicodeEscape(charNode);
-					break;
+				case "unicodeCodePoint": checkUnicodeEscape(charNode);
 			}
 		}
 	});
@@ -13602,9 +13574,7 @@ function escapeForRegexLiteral(pattern) {
 				result += char;
 				escaped = true;
 				break;
-			default:
-				result += char;
-				break;
+			default: result += char;
 		}
 	}
 	return result;
@@ -13816,9 +13786,7 @@ function* extractInvalidQuantifiers(alternatives, kind) {
 			case "Group":
 				yield* extractInvalidQuantifiers(last.alternatives, kind);
 				break;
-			case "Quantifier":
-				if (last.min !== last.max && !hasCapturingGroupDescendant(last.element)) yield last;
-				break;
+			case "Quantifier": if (last.min !== last.max && !hasCapturingGroupDescendant(last.element)) yield last;
 		}
 	}
 }
@@ -13933,17 +13901,14 @@ function isMatchAnyCharacterClass(node, flags) {
 				type: "CharacterSet"
 			});
 			break;
-		case "word":
-			if (element.negate) negativeElements.push({
-				kind: "word",
-				type: "CharacterSet"
-			});
-			else positiveElements.push({
-				kind: "word",
-				type: "CharacterSet"
-			});
-			break;
-		default: break;
+		case "word": if (element.negate) negativeElements.push({
+			kind: "word",
+			type: "CharacterSet"
+		});
+		else positiveElements.push({
+			kind: "word",
+			type: "CharacterSet"
+		});
 	}
 	else if (element.type === "CharacterClassRange" && element.min.value === 0 && (element.max.value === 65535 || element.max.value === 1114111 || flags.unicode && element.max.value >= 1114111)) return true;
 	for (const positive of positiveElements) if (negativeElements.find((negative) => negative.kind === positive.kind)) return true;
@@ -14376,12 +14341,15 @@ function* findZeroWidthJoins(characters) {
 	for (const [index, char] of characters.entries()) {
 		const previous = characters[index - 1];
 		const next = characters[index + 1];
-		if (previous && next && char.value === 8205 && previous.value !== 8205 && next.value !== 8205) if (sequence) if (sequence.at(-1) === previous) sequence.push(char, next);
-		else {
-			yield sequence;
-			sequence = characters.slice(index - 1, index + 2);
+		if (previous && next && char.value === 8205 && previous.value !== 8205 && next.value !== 8205) {
+			if (sequence) {
+				if (sequence.at(-1) === previous) sequence.push(char, next);
+				else {
+					yield sequence;
+					sequence = characters.slice(index - 1, index + 2);
+				}
+			} else sequence = characters.slice(index - 1, index + 2);
 		}
-		else sequence = characters.slice(index - 1, index + 2);
 	}
 	if (sequence) yield sequence;
 }
@@ -14429,7 +14397,6 @@ function* iterateCharacterSequence(nodes) {
 			sequence.push(node.min);
 			yield sequence;
 			sequence = [node.max];
-			break;
 	}
 	if (sequence.length) yield sequence;
 }
@@ -15844,9 +15811,7 @@ function findReachableQuantifiers(pattern) {
 				case "Group":
 					for (const innerAlternative of element.alternatives) walkAlternative(innerAlternative);
 					break;
-				case "Quantifier":
-					if (element.max === Infinity && element.min === 0) quantifiers.push(element);
-					break;
+				case "Quantifier": if (element.max === Infinity && element.min === 0) quantifiers.push(element);
 			}
 			if (!canMatchEmpty(element)) return;
 		}
@@ -15865,19 +15830,15 @@ function generateAttackString(quantifier) {
 			if (first.type === "Character") character = String.fromCharCode(first.value);
 			break;
 		}
-		case "CharacterSet":
-			switch (quantifier.element.kind) {
-				case "any":
-					character = "x";
-					break;
-				case "digit":
-					character = "0";
-					break;
-				case "space":
-					character = " ";
-					break;
-			}
-			break;
+		case "CharacterSet": switch (quantifier.element.kind) {
+			case "any":
+				character = "x";
+				break;
+			case "digit":
+				character = "0";
+				break;
+			case "space": character = " ";
+		}
 	}
 	return (character ?? "a").repeat(20);
 }
@@ -17846,9 +17807,7 @@ function isOptionalAssertion(quantifierElement, assertion) {
 					}
 				}
 				break;
-			case "Quantifier":
-				if (parent !== quantifierElement && parent.max > 1 && canConsumeCharacters(parent.element)) return false;
-				break;
+			case "Quantifier": if (parent !== quantifierElement && parent.max > 1 && canConsumeCharacters(parent.element)) return false;
 		}
 		current = parent;
 	}
@@ -20385,15 +20344,13 @@ var tsComments_default = ruleCreator.createRule(typescriptLanguage, {
 					case true:
 						reportCommentDirective(comment, directive, { directive }, "directiveComment", "preferExpectError");
 						return;
-					default:
-						if (typeof config === "object" && config.descriptionFormat) {
-							const format = descriptionFormats.get(directive);
-							if (format && !format.test(description)) reportCommentDirective(comment, directive, {
-								directive,
-								format: format.source
-							}, "descriptionNotMatchPattern");
-						}
-						break;
+					default: if (typeof config === "object" && config.descriptionFormat) {
+						const format = descriptionFormats.get(directive);
+						if (format && !format.test(description)) reportCommentDirective(comment, directive, {
+							directive,
+							format: format.source
+						}, "descriptionNotMatchPattern");
+					}
 				}
 			}
 		} } };
@@ -20475,8 +20432,10 @@ function getImportSpecifiers(node) {
 	const specifiers = [];
 	if (importClause.name) specifiers.push(importClause.name);
 	const namedBindings = importClause.namedBindings;
-	if (namedBindings) if (namedBindings.kind === SyntaxKind.NamespaceImport) specifiers.push(namedBindings);
-	else specifiers.push(...namedBindings.elements);
+	if (namedBindings) {
+		if (namedBindings.kind === SyntaxKind.NamespaceImport) specifiers.push(namedBindings);
+		else specifiers.push(...namedBindings.elements);
+	}
 	return specifiers;
 }
 function getReferencedSymbol(typeChecker, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flint.fyi/ts",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "description": "[Experimental] TypeScript language plugin for Flint.",
   "homepage": "https://flint.fyi/rules/ts",
   "repository": {
@@ -23,20 +23,20 @@
   ],
   "dependencies": {
     "@eslint-community/regexpp": "^4.12.2",
+    "@flint.fyi/core": "^0.26.0",
+    "@flint.fyi/typescript-language": "^0.20.1",
+    "@flint.fyi/utils": "^0.16.0",
     "regexp-ast-analysis": "^0.7.1",
     "scslre": "^0.3.0",
     "ts-api-utils": "^2.4.0",
     "typescript": "^6.0.0",
-    "zod": "^4.3.6",
-    "@flint.fyi/core": "^0.25.0",
-    "@flint.fyi/utils": "^0.16.0",
-    "@flint.fyi/typescript-language": "^0.20.0"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "tsdown": "0.22.3",
-    "vitest": "4.1.0",
-    "@flint.fyi/rule-tester": "^0.19.0",
-    "@flint.fyi/build": "^0.1.0"
+    "@flint.fyi/build": "^0.1.0",
+    "@flint.fyi/rule-tester": "^0.19.1",
+    "tsdown": "0.22.14",
+    "vitest": "4.1.11"
   },
   "engines": {
     "node": ">=26.1.0"