@trigen/oxlint-config 9.1.0 → 9.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@trigen/oxlint-config",
   "type": "module",
-  "version": "9.1.0",
+  "version": "9.2.1",
   "description": "Trigen's Oxlint config.",
   "author": "dangreen",
   "license": "MIT",

package/src/plugin/named-import-order.js

@@ -131,6 +131,11 @@ 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])
@@ -138,14 +143,16 @@ function getFixedText(node, items, options, sourceCode, range) {
     .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
         })
       }

package/src/plugin/type-import-style.js

@@ -79,6 +79,17 @@ function getTypeSpecifierText(specifier, sourceCode) {
     : `type ${text}`
 }
 
+function getLinebreak(text) {
+  return text.includes('\r\n') ? '\r\n' : '\n'
+}
+
+function getLineIndent(text, index) {
+  const lineStart = text.lastIndexOf('\n', index - 1) + 1
+  const indentMatch = /^[ \t]*/.exec(text.slice(lineStart, index))
+
+  return indentMatch[0]
+}
+
 function getMergedText(typeNode, valueNode, sourceCode) {
   const typeSpecifiers = typeNode.specifiers.map(specifier => getTypeSpecifierText(
     specifier,
@@ -88,11 +99,15 @@ function getMergedText(typeNode, valueNode, sourceCode) {
     specifier
   ))
   const source = sourceCode.getText(valueNode.source)
-
-  return `import { ${[
+  const linebreak = getLinebreak(sourceCode.text)
+  const closingIndent = getLineIndent(sourceCode.text, valueNode.range[0])
+  const indent = `${closingIndent}  `
+  const specifiers = [
     ...typeSpecifiers,
     ...valueSpecifiers
-  ].join(', ')} } from ${source}`
+  ]
+
+  return `import {${linebreak}${indent}${specifiers.join(`,${linebreak}${indent}`)}${linebreak}${closingIndent}} from ${source}`
 }
 
 function getFixedText(node, sourceCode) {