feat(oxlint-config): named-import-order newlines

Author: dangreen

packages/oxlint-config/src/plugin/named-import-order.js

@@ -131,21 +131,28 @@ function hasInnerComments(sourceCode, range) {
     && comment.range[1] < range[1])
 }
 
+function shouldBeMultiline(sourceCode, range, items) {
+  return items.length > 1
+    && !sourceCode.text.slice(range[0], range[1]).includes('\n')
+}
+
 function getFixedText(node, items, options, sourceCode, range) {
   const text = sourceCode.text
   const content = text.slice(range[0], range[1])
   const sortedSpecifiers = [...items]
     .sort(compareItems)
     .map(({ specifier }) => sourceCode.getText(specifier))
 
-  if (!content.includes('\n')) {
+  if (!content.includes('\n') && items.length < 2) {
     return ` ${sortedSpecifiers.join(', ')} `
   }
 
   const linebreak = getLinebreak(text)
   const firstSpecifier = items[0].specifier
-  const indent = getLineIndent(text, firstSpecifier.range[0])
   const closingIndent = getLineIndent(text, node.range[0])
+  const indent = content.includes('\n')
+    ? getLineIndent(text, firstSpecifier.range[0])
+    : `${closingIndent}  `
 
   return `${linebreak}${indent}${sortedSpecifiers.join(`,${linebreak}${indent}`)}${linebreak}${closingIndent}`
 }
@@ -203,13 +210,18 @@ export default {
         }
 
         const unorderedPair = getFirstUnorderedPair(items)
+        const sourceCode = context.sourceCode
+        const range = getBracesRange(node, items, sourceCode)
+        const invalidMultiline = range && shouldBeMultiline(
+          sourceCode,
+          range,
+          items
+        )
 
-        if (!unorderedPair) {
+        if (!unorderedPair && !invalidMultiline) {
           return
         }
 
-        const sourceCode = context.sourceCode
-        const range = getBracesRange(node, items, sourceCode)
         const fix = range && !hasInnerComments(sourceCode, range)
           ? fixer => fixer.replaceTextRange(
             range,
@@ -219,11 +231,16 @@ export default {
         const [
           previousItem,
           item
-        ] = unorderedPair
+        ] = unorderedPair ?? [
+          items[0],
+          items[1]
+        ]
 
         context.report({
           node: item.specifier,
-          message: getMessage(previousItem, item),
+          message: unorderedPair
+            ? getMessage(previousItem, item)
+            : 'Expected named imports to be multiline.',
           fix
         })
       }

packages/oxlint/src/index.spec.js

@@ -1,4 +1,8 @@
-import { describe, it, expect } from 'vitest'
+import {
+  describe,
+  it,
+  expect
+} from 'vitest'
 import { defineConfig } from './index.js'
 
 describe('oxlint', () => {

packages/project-files/src/api.js

@@ -1,4 +1,7 @@
-import { dirname, join } from 'path'
+import {
+  dirname,
+  join
+} from 'path'
 import { Octokit } from '@octokit/rest'
 import { writeFile } from './fs.js'
 

packages/project-files/src/bin.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 import { fileURLToPath } from 'url'
-import { dirname, join } from 'path'
+import {
+  dirname,
+  join
+} from 'path'
 import {
   readFile,
   writeFile,

packages/project-files/src/parse.spec.js

@@ -1,5 +1,12 @@
-import { describe, it, expect } from 'vitest'
-import { parseFilesList, parseSourcesList } from './parse.js'
+import {
+  describe,
+  it,
+  expect
+} from 'vitest'
+import {
+  parseFilesList,
+  parseSourcesList
+} from './parse.js'
 
 describe('project-files', () => {
   describe('parse', () => {

packages/scripts/src/utils/args.js

@@ -1,4 +1,7 @@
-import { read, argv } from 'argue-cli'
+import {
+  read,
+  argv
+} from 'argue-cli'
 
 const pnpm7 = 7
 

packages/scripts/src/utils/args.spec.js

@@ -1,6 +1,14 @@
-import { describe, it, expect } from 'vitest'
+import {
+  describe,
+  it,
+  expect
+} from 'vitest'
 import { setArgs } from 'argue-cli'
-import { detectPackageManager, getRunArgs, readScripts } from './args.js'
+import {
+  detectPackageManager,
+  getRunArgs,
+  readScripts
+} from './args.js'
 
 describe('scripts', () => {
   describe('utils', () => {

packages/scripts/src/utils/files.js

@@ -1,5 +1,11 @@
-import { resolve, dirname } from 'path'
-import { constants, promises } from 'fs'
+import {
+  resolve,
+  dirname
+} from 'path'
+import {
+  constants,
+  promises
+} from 'fs'
 
 const { access, readFile } = promises