feat(object-curly-spacing): support ImportAttribute (#862)

9romise · web-flow · commit 000f2f49e706 · 2025-07-16T04:32:32.000Z
diff --git a/packages/eslint-plugin/rules/object-curly-spacing/object-curly-spacing._ts_.test.ts b/packages/eslint-plugin/rules/object-curly-spacing/object-curly-spacing._ts_.test.ts
@@ -315,6 +315,17 @@ run<RuleOptions, MessageIds>({
       code: 'enum Foo {ONE, TWO,}',
       options: ['never'],
     },
+    {
+      code: `import pkgJson from 'package.json' with {type: 'json'}`,
+    },
+    {
+      code: `export { name } from 'package.json' with { type: 'json' }`,
+      options: ['always'],
+    },
+    {
+      code: `export * from 'package.json' with {type: 'json'}`,
+      options: ['never'],
+    },
   ],
 
   invalid: [
@@ -467,5 +478,31 @@ run<RuleOptions, MessageIds>({
         { messageId: 'requireSpaceBefore' },
       ],
     },
+    {
+      code: `import pkgJson from 'package.json' with { type: 'json' }`,
+      output: `import pkgJson from 'package.json' with {type: 'json'}`,
+      errors: [
+        { messageId: 'unexpectedSpaceAfter' },
+        { messageId: 'unexpectedSpaceBefore' },
+      ],
+    },
+    {
+      code: `export { name } from 'package.json' with {type: 'json'}`,
+      output: `export { name } from 'package.json' with { type: 'json' }`,
+      options: ['always'],
+      errors: [
+        { messageId: 'requireSpaceAfter' },
+        { messageId: 'requireSpaceBefore' },
+      ],
+    },
+    {
+      code: `export * from 'package.json' with { type: 'json' }`,
+      output: `export * from 'package.json' with {type: 'json'}`,
+      options: ['never'],
+      errors: [
+        { messageId: 'unexpectedSpaceAfter' },
+        { messageId: 'unexpectedSpaceBefore' },
+      ],
+    },
   ],
 })
diff --git a/packages/eslint-plugin/rules/object-curly-spacing/object-curly-spacing.ts b/packages/eslint-plugin/rules/object-curly-spacing/object-curly-spacing.ts
@@ -6,6 +6,7 @@ import {
   isClosingBraceToken,
   isClosingBracketToken,
   isNotCommaToken,
+  isOpeningBraceToken,
   isTokenOnSameLine,
 } from '#utils/ast'
 import { createRule } from '#utils/create-rule'
@@ -254,7 +255,7 @@ export default createRule<RuleOptions, MessageIds>({
 
       const closeToken = sourceCode.getTokenAfter(properties.at(-1)!, isClosingBraceToken)!
 
-      const openingToken = sourceCode.getFirstToken(node)!
+      const openingToken = sourceCode.getTokenBefore(properties[0], isOpeningBraceToken)!
 
       validateBraceSpacing(node, openingToken, closeToken)
     }
@@ -308,9 +309,23 @@ export default createRule<RuleOptions, MessageIds>({
         checkForObjectLike(node, node.properties)
       },
       // import {y} from 'x';
-      ImportDeclaration: checkForImport,
+      ImportDeclaration(node) {
+        checkForImport(node)
+
+        if (node.attributes)
+          checkForObjectLike(node, node.attributes)
+      },
       // export {name} from 'yo';
-      ExportNamedDeclaration: checkForExport,
+      ExportNamedDeclaration(node) {
+        checkForExport(node)
+
+        if (node.attributes)
+          checkForObjectLike(node, node.attributes)
+      },
+      ExportAllDeclaration(node) {
+        if (node.attributes)
+          checkForObjectLike(node, node.attributes)
+      },
       TSMappedType(node) {
         const openingToken = sourceCode.getFirstToken(node)!
         const closeToken = sourceCode.getLastToken(node)!
