fix(eslint/jsx-sort-props): correct sort for reservedProps

Author: zhiyuanzmj

docs/introduction/eslint.md

@@ -71,7 +71,7 @@ const After = <App v-if={list} v-for={i in list} a b />
 
 ### `reservedLast`
 
-Defaults to `['v-text', 'v-html', 'v-slots', 'v-slot']`
+Defaults to `['v-slot', 'v-slots', 'v-text', 'v-html']`
 
 This can be an array option. These props must be listed after all other props.
 These will respect the order specified in the array:

packages/eslint/src/index.ts

@@ -29,7 +29,7 @@ export default ({ rules = {}, ...options }: Linter.Config<Rules> = {}) => ({
           'ref',
           'v-model',
         ],
-        reservedLast: ['v-text', 'v-html', 'v-slots', 'v-slot'],
+        reservedLast: ['v-slot', 'v-slots', 'v-text', 'v-html'],
       },
     ],
     'vue-jsx-vapor/define-style': rules['vue-jsx-vapor/define-style'] || 'warn',

packages/eslint/src/rules/jsx-sort-props/index.ts

@@ -143,8 +143,8 @@ function contextCompare(
 ) {
   let aProp = getPropName(a)
   let bProp = getPropName(b)
-  const aPropWithoutNamespace = aProp.split(':')[0]
-  const bPropWithoutNamespace = bProp.split(':')[0]
+  const aPropNamespace = aProp.split(':')[0]
+  const bPropNamespace = bProp.split(':')[0]
 
   const aSortToEnd = shouldSortToEnd(a)
   const bSortToEnd = shouldSortToEnd(b)
@@ -159,11 +159,7 @@ function contextCompare(
 
     if (aIndex === -1 && bIndex > -1) return 1
 
-    if (
-      aIndex > -1 &&
-      bIndex > -1 &&
-      aPropWithoutNamespace !== bPropWithoutNamespace
-    )
+    if (aIndex > -1 && bIndex > -1 && aPropNamespace !== bPropNamespace)
       return aIndex > bIndex ? 1 : -1
   }
 
@@ -174,12 +170,8 @@ function contextCompare(
 
     if (aLastIndex === -1 && bLastIndex > -1) return -1
 
-    if (
-      aLastIndex > -1 &&
-      bLastIndex > -1 &&
-      aPropWithoutNamespace !== bPropWithoutNamespace
-    )
-      return aLastIndex > bLastIndex ? 1 : -1
+    if (aLastIndex > -1 && bLastIndex > -1 && aPropNamespace !== bPropNamespace)
+      return aLastIndex > bLastIndex ? -1 : 1
   }
 
   if (options.callbacksLast) {
@@ -566,6 +558,8 @@ const rule: RuleModule<MessageIds, RuleOptions> = {
 
           let previousPropName = getPropName(memo)
           let currentPropName = getPropName(decl)
+          const previousReservedNamespace = previousPropName.split(':')[0]
+          const currentReservedNamespace = currentPropName.split(':')[0]
           const previousValue = (memo as Tree.JSXAttribute).value
           const currentValue = decl.value
           const previousIsCallback = isCallbackPropName(previousPropName)
@@ -609,6 +603,14 @@ const rule: RuleModule<MessageIds, RuleOptions> = {
 
               return memo
             }
+
+            if (
+              previousReservedIndex > -1 &&
+              currentReservedIndex > -1 &&
+              currentReservedIndex > previousReservedIndex &&
+              previousReservedNamespace !== currentReservedNamespace
+            )
+              return decl
           }
 
           if (reservedLastList.length > 0) {
@@ -638,6 +640,14 @@ const rule: RuleModule<MessageIds, RuleOptions> = {
 
               return memo
             }
+
+            if (
+              previousReservedIndex > -1 &&
+              currentReservedIndex > -1 &&
+              currentReservedIndex > previousReservedIndex &&
+              previousReservedNamespace !== currentReservedNamespace
+            )
+              return decl
           }
 
           if (callbacksLast) {