From 66d24c352072f0715381dbd1989513c1191a379e Mon Sep 17 00:00:00 2001
From: kzhrk <info@kzhrk.com>
Date: Tue, 11 Nov 2025 23:44:55 +0900
Subject: [PATCH 1/2] fix(define-macros-order): distinguish between macros
 placement and ordering errors (#2940)

Separate error messages for two distinct cases:
- macrosNotAtTop: when a macro comes after non-macro statements
- macrosUnordered: when macros are not in the correct order relative to each other

This provides clearer feedback to users about what needs to be fixed.
---
 .../improve-define-macros-order-messages.md   |  5 ++
 lib/rules/define-macros-order.js              | 25 +++++++--
 tests/lib/rules/define-macros-order.js        | 56 ++++++++++---------
 3 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/improve-define-macros-order-messages.md

diff --git a/.changeset/improve-define-macros-order-messages.md b/.changeset/improve-define-macros-order-messages.md
new file mode 100644
index 000000000..086a7c999
--- /dev/null
+++ b/.changeset/improve-define-macros-order-messages.md
@@ -0,0 +1,5 @@
+---
+'eslint-plugin-vue': patch
+---
+
+Improved `vue/define-macros-order` error messages to distinguish between macro placement and ordering issues
diff --git a/lib/rules/define-macros-order.js b/lib/rules/define-macros-order.js
index bd49b7707..275c13169 100644
--- a/lib/rules/define-macros-order.js
+++ b/lib/rules/define-macros-order.js
@@ -220,13 +220,25 @@ function create(context) {
    * @param {ASTNode} before
    */
   function reportNotOnTop(macro, nodes, before) {
+    // Determine if 'before' is a macro from the order list
+    let beforeMacro = null
+    for (const macroName of order) {
+      const macroNodes = macrosNodes.get(macroName) ?? []
+      if (macroNodes.includes(before)) {
+        beforeMacro = macroName
+        break
+      }
+    }
+
+    // Decide which message to use
+    const messageId = beforeMacro ? 'macrosUnordered' : 'macrosNotAtTop'
+    const data = beforeMacro ? { macro, before: beforeMacro } : { macro }
+
     context.report({
       node: nodes[0],
       loc: nodes[0].loc,
-      messageId: 'macrosNotOnTop',
-      data: {
-        macro
-      },
+      messageId,
+      data,
       *fix(fixer) {
         for (const node of nodes) {
           yield* moveNodeBefore(fixer, node, before)
@@ -392,8 +404,9 @@ module.exports = {
       }
     ],
     messages: {
-      macrosNotOnTop:
-        '{{macro}} should be the first statement in `<script setup>` (after any potential import statements or type definitions).',
+      macrosNotAtTop:
+        '{{macro}} should be placed at the top of `<script setup>` (after any potential import statements or type definitions).',
+      macrosUnordered: '{{macro}} should be above {{before}}.',
       defineExposeNotTheLast:
         '`defineExpose` should be the last statement in `<script setup>`.',
       putExposeAtTheLast:
diff --git a/tests/lib/rules/define-macros-order.js b/tests/lib/rules/define-macros-order.js
index 087952c86..886acd68c 100644
--- a/tests/lib/rules/define-macros-order.js
+++ b/tests/lib/rules/define-macros-order.js
@@ -33,8 +33,12 @@ const optionsExposeLast = [
   }
 ]
 
-function message(macro) {
-  return `${macro} should be the first statement in \`<script setup>\` (after any potential import statements or type definitions).`
+function notAtTopMessage(macro) {
+  return `${macro} should be placed at the top of \`<script setup>\` (after any potential import statements or type definitions).`
+}
+
+function unorderedMessage(macro, before) {
+  return `${macro} should be above ${before}.`
 }
 
 const defineExposeNotTheLast =
@@ -355,7 +359,7 @@ tester.run('define-macros-order', rule, {
       options: optionsEmitsFirst,
       errors: [
         {
-          message: message('defineEmits'),
+          message: notAtTopMessage('defineEmits'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -394,7 +398,7 @@ tester.run('define-macros-order', rule, {
       options: optionsPropsFirst,
       errors: [
         {
-          message: message('defineProps'),
+          message: notAtTopMessage('defineProps'),
           line: 8,
           column: 11,
           endLine: 10,
@@ -430,7 +434,7 @@ tester.run('define-macros-order', rule, {
       options: optionsPropsFirst,
       errors: [
         {
-          message: message('defineProps'),
+          message: unorderedMessage('defineProps', 'defineEmits'),
           line: 6,
           column: 11,
           endLine: 8,
@@ -465,7 +469,7 @@ tester.run('define-macros-order', rule, {
       options: optionsEmitsFirst,
       errors: [
         {
-          message: message('defineEmits'),
+          message: notAtTopMessage('defineEmits'),
           line: 8,
           column: 11,
           endLine: 8,
@@ -502,7 +506,7 @@ tester.run('define-macros-order', rule, {
       options: [{ order: ['definePage', 'defineProps'] }],
       errors: [
         {
-          message: message('definePage'),
+          message: notAtTopMessage('definePage'),
           line: 8,
           column: 11,
           endLine: 10,
@@ -548,7 +552,7 @@ tester.run('define-macros-order', rule, {
       },
       errors: [
         {
-          message: message('defineEmits'),
+          message: unorderedMessage('defineEmits', 'defineProps'),
           line: 12,
           column: 11,
           endLine: 12,
@@ -606,7 +610,7 @@ tester.run('define-macros-order', rule, {
       },
       errors: [
         {
-          message: message('definePage'),
+          message: unorderedMessage('definePage', 'defineProps'),
           line: 15,
           column: 11,
           endLine: 17,
@@ -647,7 +651,7 @@ tester.run('define-macros-order', rule, {
       },
       errors: [
         {
-          message: message('defineProps'),
+          message: notAtTopMessage('defineProps'),
           line: 10,
           column: 11,
           endLine: 10,
@@ -705,7 +709,7 @@ tester.run('define-macros-order', rule, {
       },
       errors: [
         {
-          message: message('defineEmits'),
+          message: notAtTopMessage('defineEmits'),
           line: 16,
           column: 11,
           endLine: 16,
@@ -727,7 +731,7 @@ tester.run('define-macros-order', rule, {
       options: optionsEmitsFirst,
       errors: [
         {
-          message: message('defineEmits'),
+          message: unorderedMessage('defineEmits', 'defineProps'),
           line: 3,
           column: 56,
           endLine: 3,
@@ -749,7 +753,7 @@ tester.run('define-macros-order', rule, {
       options: [{ order: ['definePage', 'defineProps'] }],
       errors: [
         {
-          message: message('definePage'),
+          message: unorderedMessage('definePage', 'defineProps'),
           line: 3,
           column: 56,
           endLine: 3,
@@ -787,7 +791,7 @@ tester.run('define-macros-order', rule, {
       `,
       errors: [
         {
-          message: message('defineProps'),
+          message: unorderedMessage('defineProps', 'defineEmits'),
           line: 11,
           column: 11,
           endLine: 11,
@@ -805,7 +809,7 @@ tester.run('define-macros-order', rule, {
       `,
       errors: [
         {
-          message: message('defineProps'),
+          message: unorderedMessage('defineProps', 'defineEmits'),
           line: 2,
           column: 52,
           endLine: 2,
@@ -830,7 +834,7 @@ tester.run('define-macros-order', rule, {
       options: optionsEmitsFirst,
       errors: [
         {
-          message: message('defineProps'),
+          message: notAtTopMessage('defineProps'),
           line: 4,
           column: 11,
           endLine: 4,
@@ -857,7 +861,7 @@ tester.run('define-macros-order', rule, {
       options: optionsEmitsFirst,
       errors: [
         {
-          message: message('defineProps'),
+          message: notAtTopMessage('defineProps'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -884,7 +888,7 @@ tester.run('define-macros-order', rule, {
       options: [{ order: ['defineCustom', 'definePage'] }],
       errors: [
         {
-          message: message('defineCustom'),
+          message: unorderedMessage('defineCustom', 'definePage'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -911,7 +915,7 @@ tester.run('define-macros-order', rule, {
       options: [{ order: ['defineCustom', 'definePage'] }],
       errors: [
         {
-          message: message('defineCustom'),
+          message: unorderedMessage('defineCustom', 'definePage'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -966,7 +970,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineOptions'),
+          message: notAtTopMessage('defineOptions'),
           line: 12,
           column: 11,
           endLine: 12,
@@ -1017,7 +1021,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineOptions'),
+          message: unorderedMessage('defineOptions', 'defineSlots'),
           line: 6,
           column: 11,
           endLine: 6,
@@ -1128,7 +1132,7 @@ tester.run('define-macros-order', rule, {
           ]
         },
         {
-          message: message('defineOptions'),
+          message: unorderedMessage('defineOptions', 'defineEmits'),
           line: 8,
           column: 11,
           endLine: 8,
@@ -1163,7 +1167,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineModel'),
+          message: unorderedMessage('defineModel', 'defineOptions'),
           line: 6,
           column: 11,
           endLine: 6,
@@ -1194,7 +1198,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineModel'),
+          message: unorderedMessage('defineModel', 'defineOptions'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -1235,7 +1239,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineSomething'),
+          message: unorderedMessage('defineSomething', 'defineOptions'),
           line: 5,
           column: 11,
           endLine: 5,
@@ -1271,7 +1275,7 @@ tester.run('define-macros-order', rule, {
       ],
       errors: [
         {
-          message: message('defineModel'),
+          message: unorderedMessage('defineModel', 'defineOptions'),
           line: 5,
           column: 11,
           endLine: 5,

From 41323da5f3fbc35e772ed9f5380e516cc1f92539 Mon Sep 17 00:00:00 2001
From: Kazuhiro Kobayashi <info@kzhrk.com>
Date: Wed, 12 Nov 2025 00:18:09 +0900
Subject: [PATCH 2/2] refactor(define-macros-order): simplify beforeMacro
 detection logic

Use array.find() instead of a for loop with break statement for a more
idiomatic and readable approach to finding the macro name.

Co-authored-by: Flo Edelmann <git@flo-edelmann.de>
---
 lib/rules/define-macros-order.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/rules/define-macros-order.js b/lib/rules/define-macros-order.js
index 275c13169..1e32d7f18 100644
--- a/lib/rules/define-macros-order.js
+++ b/lib/rules/define-macros-order.js
@@ -221,14 +221,9 @@ function create(context) {
    */
   function reportNotOnTop(macro, nodes, before) {
     // Determine if 'before' is a macro from the order list
-    let beforeMacro = null
-    for (const macroName of order) {
-      const macroNodes = macrosNodes.get(macroName) ?? []
-      if (macroNodes.includes(before)) {
-        beforeMacro = macroName
-        break
-      }
-    }
+    const beforeMacro = order.find((macroName) =>
+      (macrosNodes.get(macroName) ?? []).includes(before)
+    )
 
     // Decide which message to use
     const messageId = beforeMacro ? 'macrosUnordered' : 'macrosNotAtTop'