[pull] master from getsentry:master

.oxfmtrc.json

@@ -115,6 +115,7 @@
     "api-docs/**/*.json",
     ".vscode/**",
     "static/app/data/world.json",
-    "tests/sentry/grouping/**/*.json"
+    "tests/sentry/grouping/**/*.json",
+    "pyproject.toml"
   ]
 }

eslint.config.ts

@@ -919,6 +919,7 @@ export default typescript.config([
     name: 'plugin/prettier',
     extends: [prettier],
     rules: {
+      curly: 'error',
       // import sorting is handled by oxfmt
       'import/order': 'off',
       'sort-imports': 'off',

scripts/analyze-styled.ts

@@ -203,8 +203,12 @@ function getCommitsInDateRange(startDate: string, intervalDays: number): GitComm
 
 // CSV helper functions
 function escapeCsvField(field: string | number): string {
-  if (typeof field === 'number') return field.toString();
-  if (field === null || field === undefined) return '';
+  if (typeof field === 'number') {
+    return field.toString();
+  }
+  if (field === null || field === undefined) {
+    return '';
+  }
   const fieldStr = field.toString();
   if (fieldStr.includes(',') || fieldStr.includes('"') || fieldStr.includes('\n')) {
     return `"${fieldStr.replace(/"/g, '""')}"`;
@@ -213,7 +217,9 @@ function escapeCsvField(field: string | number): string {
 }
 
 function arrayToCSV(data: Array<Record<string, any>>): string {
-  if (data.length === 0) return '';
+  if (data.length === 0) {
+    return '';
+  }
 
   const headers = Object.keys(data[0] ?? {});
   const csvHeaders = headers.map(escapeCsvField).join(',');
@@ -647,7 +653,9 @@ class StyledComponentsDetector extends BaseDetector {
   private cssRuleCounts = new Map<string, number>();
 
   execute(node: ts.Node, context: DetectorContext): void {
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -656,7 +664,9 @@ class StyledComponentsDetector extends BaseDetector {
 
       if (callExpr.expression.getText() === 'styled') {
         const component = callExpr.arguments[0];
-        if (!component) return;
+        if (!component) {
+          return;
+        }
 
         let componentName = '';
         let componentType: 'intrinsic' | 'component' | 'unknown' = 'unknown';
@@ -810,9 +820,13 @@ class StyledComponentsDetector extends BaseDetector {
     let staticExpressions = 0;
 
     this.styledComponents.forEach(sc => {
-      if (sc.componentType === 'component') totalReactComponents++;
-      else if (sc.componentType === 'intrinsic') totalIntrinsic++;
-      else unknownComponents++;
+      if (sc.componentType === 'component') {
+        totalReactComponents++;
+      } else if (sc.componentType === 'intrinsic') {
+        totalIntrinsic++;
+      } else {
+        unknownComponents++;
+      }
 
       // Count expressions
       if (sc.hasExpressions) {
@@ -1040,7 +1054,9 @@ class StyledUsagePerFileDetector extends BaseDetector {
     // Track all TSX files we analyze
     this.totalTsxFiles.add(context.fileName);
 
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -1124,7 +1140,9 @@ class FlexOnlyDivsDetector extends BaseDetector {
   private styledComponents: StyledComponent[] = [];
 
   execute(node: ts.Node, context: DetectorContext): void {
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -1133,7 +1151,9 @@ class FlexOnlyDivsDetector extends BaseDetector {
 
       if (callExpr.expression.getText() === 'styled') {
         const component = callExpr.arguments[0];
-        if (!component) return;
+        if (!component) {
+          return;
+        }
 
         let componentName = '';
         let componentType: 'intrinsic' | 'component' | 'unknown' = 'unknown';

scripts/extractFormFields.ts

@@ -71,14 +71,22 @@ class FormFieldExtractor {
 
     for (const sourceFile of this.program.getSourceFiles()) {
       // Skip node_modules
-      if (sourceFile.fileName.includes('node_modules')) continue;
+      if (sourceFile.fileName.includes('node_modules')) {
+        continue;
+      }
 
       // Only process app files
-      if (!sourceFile.fileName.includes('static/app/')) continue;
+      if (!sourceFile.fileName.includes('static/app/')) {
+        continue;
+      }
 
       // Skip test and story files
-      if (sourceFile.fileName.includes('.spec.')) continue;
-      if (sourceFile.fileName.includes('.stories.')) continue;
+      if (sourceFile.fileName.includes('.spec.')) {
+        continue;
+      }
+      if (sourceFile.fileName.includes('.stories.')) {
+        continue;
+      }
 
       const fileFields = this.extractFromFile(sourceFile);
       fields.push(...fileFields);
@@ -169,7 +177,9 @@ class FormFieldExtractor {
 
     // Extract 'name' attribute
     const nameAttr = this.getJsxAttribute(node, 'name');
-    if (!nameAttr) return null;
+    if (!nameAttr) {
+      return null;
+    }
 
     // Extract metadata from render prop children
     const fieldMetadata = this.extractFieldMetadata(node, sourceFile);
@@ -219,7 +229,9 @@ class FormFieldExtractor {
 
         // Extract label/hintText props from any component
         const label = this.getJsxAttributeExpression(node, 'label', sourceFile);
-        if (label && !metadata.label) metadata.label = label;
+        if (label && !metadata.label) {
+          metadata.label = label;
+        }
 
         if (this.hasJsxAttribute(node, 'hintText') && !metadata.hintText) {
           const hintText = this.getJsxAttributeExpression(node, 'hintText', sourceFile);
@@ -230,7 +242,9 @@ class FormFieldExtractor {
         // Extract label from Meta.Label (text is in children)
         if (tagName?.endsWith('.Label') || tagName === 'Meta.Label') {
           const text = this.getJsxTextContent(node, sourceFile);
-          if (text && !metadata.label) metadata.label = text;
+          if (text && !metadata.label) {
+            metadata.label = text;
+          }
         }
 
         // Extract hintText from Meta.HintText (text is in children)
@@ -269,7 +283,9 @@ class FormFieldExtractor {
       // Direct text: <Meta.Label>Name</Meta.Label>
       if (ts.isJsxText(child)) {
         const text = child.text.trim();
-        if (text) return `"${text}"`;
+        if (text) {
+          return `"${text}"`;
+        }
       }
       // Expression: <Meta.Label>{t('Name')}</Meta.Label> -> t('Name')
       if (ts.isJsxExpression(child) && child.expression) {