feat(oxlint-config): review fixes

Author: dangreen

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

@@ -235,6 +235,18 @@ function canFix(sourceCode, items) {
   return !hasInnerComments(sourceCode, items)
 }
 
+function hasSkippedImportsBetween(imports, items) {
+  const itemNodes = new Set(items.map(({ node }) => node))
+  const [
+    start,
+    end
+  ] = getImportBlockRange(items)
+
+  return imports.some(node => !itemNodes.has(node)
+    && node.range[0] > start
+    && node.range[1] < end)
+}
+
 function getFixedImportText(sourceCode, items, options) {
   const linebreak = getLinebreak(sourceCode.text)
   const separator = options['newlines-between'] === 'always'
@@ -346,6 +358,7 @@ export default {
         }
 
         const fix = canFix(sourceCode, items)
+          && !hasSkippedImportsBetween(imports, items)
           ? fixer => fixer.replaceTextRange(
             getImportBlockRange(items),
             getFixedImportText(sourceCode, items, options)

packages/oxlint-config/src/plugin/type-import-style.js

@@ -1,5 +1,6 @@
 function shouldConvert(node) {
   return node.importKind !== 'type'
+    && !hasImportAttributes(node)
     && node.specifiers.length > 0
     && node.specifiers.every(specifier => specifier.type === 'ImportSpecifier'
       && specifier.importKind === 'type')
@@ -28,6 +29,16 @@ function hasCommentsBetween(sourceCode, left, right) {
     && comment.range[1] < right.range[0])
 }
 
+function getLocalName(specifier) {
+  return specifier.local?.name ?? null
+}
+
+function hasOverlappingLocalNames(left, right) {
+  const leftNames = new Set(left.specifiers.map(getLocalName))
+
+  return right.specifiers.some(specifier => leftNames.has(getLocalName(specifier)))
+}
+
 function canMerge(sourceCode, typeNode, valueNode) {
   return typeNode.source.value === valueNode.source.value
     && isTypeImport(typeNode)
@@ -36,6 +47,7 @@ function canMerge(sourceCode, typeNode, valueNode) {
     && !isTypeImport(valueNode)
     && !hasImportAttributes(typeNode)
     && !hasImportAttributes(valueNode)
+    && !hasOverlappingLocalNames(typeNode, valueNode)
     && !hasCommentsBetween(sourceCode, typeNode, valueNode)
 }
 

packages/oxlint-config/src/subconfigs/basic.js

@@ -162,7 +162,7 @@ export default {
     'eslint/no-useless-concat': 'error',
     'eslint/no-useless-return': 'error',
     'eslint/no-void': [
-      'off',
+      'error',
       {
         allowAsStatement: true
       }