[Fix] order: Fix alphabetize for mixed requires and imports

Fixes #1625

CHANGELOG.md

@@ -10,6 +10,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - [`extensions`]: for invalid code where `name` does not exist, do not crash ([#1613], thanks [@ljharb])
 - [`extentions`]: Fix scope regex ([#1611], thanks [@yordis])
 - [`no-duplicates`]: allow duplicate imports if one is a namespace and the other not ([#1612], thanks [@sveyret])
+- [`order`]: Fix alphabetize for mixed requires and imports ([#1625], thanks [@wschurman])
 
 ### Changed
 - [`import/external-module-folders` setting] behavior is more strict now: it will only match complete path segments ([#1605], thanks [@skozin])

src/rules/order.js

@@ -289,7 +289,7 @@ function mutateRanksToAlphabetize(imported, alphabetizeOptions) {
   let newRank = 0
   const alphabetizedRanks = groupRanks.sort().reduce(function(acc, groupRank) {
     groupedByRanks[groupRank].forEach(function(importedItemName) {
-      acc[importedItemName] = newRank
+      acc[importedItemName] = parseInt(groupRank, 10) + newRank
       newRank += 1
     })
     return acc

tests/src/rules/order.js

@@ -645,6 +645,22 @@ ruleTester.run('order', rule, {
         'newlines-between': 'always',
       }],
     }),
+    // Alphabetize with require
+    test({
+      code: `
+        import { hello } from './hello';
+        import { int } from './int';
+        const blah = require('./blah');
+        const { cello } = require('./cello');
+      `,
+      options: [
+        {
+          alphabetize: {
+            order: 'asc',
+          },
+        },
+      ],
+    }),
   ],
   invalid: [
     // builtin before external module (require)
@@ -1986,5 +2002,21 @@ ruleTester.run('order', rule, {
         message: '`foo` import should occur before import of `Bar`',
       }],
     }),
+    // Alphabetize with require
+    test({
+      code: `
+        const { cello } = require('./cello');
+        import { int } from './int';
+        const blah = require('./blah');
+        import { hello } from './hello';
+      `,
+      errors: [{
+        ruleId: 'order',
+        message: '`./int` import should occur before import of `./cello`',
+      }, {
+        ruleId: 'order',
+        message: '`./hello` import should occur before import of `./cello`',
+      }],
+    }),
   ].filter((t) => !!t),
 })