@unix/eslint 1.1.1 → 1.2.0

package/configs/plugins/function-blank-lines.js

@@ -1,18 +1,13 @@
 const lineBreakFor = sourceCode => (sourceCode.text.includes('\r\n') ? '\r\n' : '\n')
 
-const LONG_BLOCK_MIN_LINES = 4
-
 const indentationFor = (sourceCode, token) => {
   const line = sourceCode.lines[token.loc.start.line - 1] ?? ''
 
   return line.slice(0, token.loc.start.column)
 }
 
-const spacingBefore = (sourceCode, token, blankLines) =>
-  `${lineBreakFor(sourceCode).repeat(blankLines + 1)}${indentationFor(
-    sourceCode,
-    token,
-  )}`
+const spacingBefore = (sourceCode, token) =>
+  `${lineBreakFor(sourceCode)}${indentationFor(sourceCode, token)}`
 
 const paddingLineSequencesBetween = (sourceCode, leftToken, rightToken) => {
   const sequences = []
@@ -48,18 +43,36 @@ const hasTokensBetween = (sourceCode, leftToken, rightToken) =>
   sourceCode.getTokensBetween(leftToken, rightToken, { includeComments: true })
     .length > 0
 
-const reportPadding = (
+const hasBlockBody = node => {
+  if (node.type === 'BlockStatement') return true
+  if (node.type === 'FunctionDeclaration') return true
+  if (node.type === 'SwitchStatement') return true
+  if (node.type === 'TryStatement') return true
+  if (node.type === 'IfStatement') {
+    if (hasBlockBody(node.consequent)) return true
+
+    return Boolean(node.alternate && hasBlockBody(node.alternate))
+  }
+
+  return node.body?.type === 'BlockStatement'
+}
+
+const isSingleLineStatement = node => node.loc.start.line === node.loc.end.line
+
+const isRestrictedStatement = node =>
+  isSingleLineStatement(node) && !hasBlockBody(node)
+
+const reportUnexpectedBlankLine = (
   context,
   sourceCode,
-  node,
-  leftToken,
-  rightToken,
-  maxBlankLines,
-  messageId,
+  previousStatement,
+  nextStatement,
 ) => {
+  const leftToken = sourceCode.getLastToken(previousStatement)
+  const rightToken = sourceCode.getFirstToken(nextStatement)
   const sequences = paddingLineSequencesBetween(sourceCode, leftToken, rightToken)
 
-  if (blankLineCount(sequences) <= maxBlankLines) return
+  if (blankLineCount(sequences) === 0) return
 
   const [firstSequence] = sequences
 
@@ -69,7 +82,7 @@ const reportPadding = (
 
       return fixer.replaceTextRange(
         [leftToken.range[1], rightToken.range[0]],
-        spacingBefore(sourceCode, rightToken, maxBlankLines),
+        spacingBefore(sourceCode, rightToken),
       )
     },
     loc: {
@@ -79,126 +92,21 @@ const reportPadding = (
         line: firstSequence.leftToken.loc.end.line + 1,
       },
     },
-    messageId,
-    node,
+    messageId: 'unexpectedBlankLine',
+    node: nextStatement,
   })
 }
 
-const isReturnStatement = node => node.type === 'ReturnStatement'
-
-const lineCountFor = node => node.loc.end.line - node.loc.start.line + 1
-
-const hasBlockBody = node => {
-  if (node.type === 'BlockStatement') return true
-  if (node.type === 'FunctionDeclaration') return true
-  if (node.type === 'SwitchStatement') return true
-  if (node.type === 'TryStatement') return true
-  if (node.type === 'IfStatement') {
-    if (hasBlockBody(node.consequent)) return true
-
-    return Boolean(node.alternate && hasBlockBody(node.alternate))
-  }
-
-  return node.body?.type === 'BlockStatement'
-}
-
-const isLongBlockStatement = node =>
-  hasBlockBody(node) && lineCountFor(node) >= LONG_BLOCK_MIN_LINES
-
-const messageIdForStatementGap = (previousStatement, nextStatement) => {
-  if (isReturnStatement(previousStatement)) return 'unexpectedBlankLineAfterReturn'
-  if (isReturnStatement(nextStatement)) return 'tooManyBlankLinesBeforeReturn'
-
-  return 'unexpectedBlankLine'
-}
-
-const maxBlankLinesForStatementGap = (previousStatement, nextStatement) => {
-  if (isReturnStatement(previousStatement)) return 0
-  if (isReturnStatement(nextStatement)) return 1
-  if (isLongBlockStatement(previousStatement)) return 1
-  if (isLongBlockStatement(nextStatement)) return 1
-
-  return 0
-}
-
-const checkStatementList = (
-  context,
-  sourceCode,
-  node,
-  statements,
-  leftToken,
-  rightToken,
-) => {
-  if (statements.length === 0) {
-    reportPadding(
-      context,
-      sourceCode,
-      node,
-      leftToken,
-      rightToken,
-      0,
-      'unexpectedBlankLine',
-    )
-    return
-  }
-
-  const [firstStatement] = statements
-  const lastStatement = statements[statements.length - 1]
-
-  reportPadding(
-    context,
-    sourceCode,
-    firstStatement,
-    leftToken,
-    sourceCode.getFirstToken(firstStatement),
-    0,
-    'unexpectedBlankLine',
-  )
-
+const checkStatementPairs = (context, sourceCode, statements) => {
   for (let index = 1; index < statements.length; index += 1) {
     const previousStatement = statements[index - 1]
     const nextStatement = statements[index]
 
-    reportPadding(
-      context,
-      sourceCode,
-      nextStatement,
-      sourceCode.getLastToken(previousStatement),
-      sourceCode.getFirstToken(nextStatement),
-      maxBlankLinesForStatementGap(previousStatement, nextStatement),
-      messageIdForStatementGap(previousStatement, nextStatement),
-    )
-  }
-
-  reportPadding(
-    context,
-    sourceCode,
-    lastStatement,
-    sourceCode.getLastToken(lastStatement),
-    rightToken,
-    0,
-    isReturnStatement(lastStatement)
-      ? 'unexpectedBlankLineAfterReturn'
-      : 'unexpectedBlankLine',
-  )
-}
-
-const caseColonToken = (sourceCode, node) => {
-  const tokenBeforeConsequent = sourceCode.getTokenBefore(node.consequent[0])
-
-  if (tokenBeforeConsequent?.value === ':') return tokenBeforeConsequent
+    if (!isRestrictedStatement(previousStatement)) continue
+    if (!isRestrictedStatement(nextStatement)) continue
 
-  const firstToken = sourceCode.getFirstToken(node)
-
-  return sourceCode.getTokenAfter(firstToken, {
-    filter: token => token.value === ':',
-  })
-}
-
-const caseEndToken = (sourceCode, node) => {
-  const lastStatement = node.consequent[node.consequent.length - 1]
-
-  return sourceCode.getTokenAfter(sourceCode.getLastToken(lastStatement))
+    reportUnexpectedBlankLine(context, sourceCode, previousStatement, nextStatement)
+  }
 }
 
 const functionBlankLines = {
@@ -206,14 +114,12 @@ const functionBlankLines = {
     type: 'layout',
     docs: {
       description:
-        'Disallow extra blank lines in functions except before return statements',
+        'Disallow blank lines between adjacent single-line non-block statements',
     },
     fixable: 'whitespace',
     messages: {
-      tooManyBlankLinesBeforeReturn:
-        'Return statements may have at most one blank line above them.',
-      unexpectedBlankLine: 'Unexpected blank line inside function.',
-      unexpectedBlankLineAfterReturn: 'Unexpected blank line after return.',
+      unexpectedBlankLine:
+        'Unexpected blank line between adjacent single-line statements.',
     },
     schema: [],
   },
@@ -237,14 +143,7 @@ const functionBlankLines = {
       BlockStatement(node) {
         if (!isInsideFunction()) return
 
-        checkStatementList(
-          context,
-          sourceCode,
-          node,
-          node.body,
-          sourceCode.getFirstToken(node),
-          sourceCode.getLastToken(node),
-        )
+        checkStatementPairs(context, sourceCode, node.body)
       },
       FunctionDeclaration: enterFunction,
       'FunctionDeclaration:exit': exitFunction,
@@ -252,16 +151,8 @@ const functionBlankLines = {
       'FunctionExpression:exit': exitFunction,
       SwitchCase(node) {
         if (!isInsideFunction()) return
-        if (node.consequent.length === 0) return
-
-        checkStatementList(
-          context,
-          sourceCode,
-          node,
-          node.consequent,
-          caseColonToken(sourceCode, node),
-          caseEndToken(sourceCode, node),
-        )
+
+        checkStatementPairs(context, sourceCode, node.consequent)
       },
     }
   },

package/configs/ts.js

@@ -73,13 +73,6 @@ const classMemberOrder = [
   ],
 ]
 
-const recommendedTypeChecked = tseslint.configs.recommendedTypeChecked.map(
-  config => ({
-    ...config,
-    files: config.files ?? tsFiles,
-  }),
-)
-
 const withTsFiles = config => ({
   ...config,
   files: tsFiles,
@@ -91,7 +84,6 @@ export default tseslint.config(
     ...eslint.configs.recommended,
     files: tsFiles,
   },
-  ...recommendedTypeChecked,
   {
     files: tsFiles,
     languageOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unix/eslint",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "ESLint config for all @unix projects.",
   "type": "module",
   "main": "index.js",