fix(scripts): sort scripts alphabetically, including prefix when no related base script exists

Author: travi

src/package/scripts/script-comparator.js

@@ -11,7 +11,9 @@ function isPostScriptFor(a, b) {
 }
 
 function getBaseScriptOf(script) {
-  return script.replace(/^(?:pre|post)/, '');
+  if (script.startsWith('pre')) return script.slice(3);
+  if (script.startsWith('post')) return script.slice(4);
+  return script;
 }
 
 function getCategoryOrder(base) {
@@ -36,8 +38,8 @@ export default function compareScriptNames(a, b) {
   const categoryDiff = getCategoryOrder(aBase) - getCategoryOrder(bBase);
   if (0 !== categoryDiff) return 0 > categoryDiff ? -1 : 1;
 
-  const baseCompare = aBase.localeCompare(bBase);
-  if (0 !== baseCompare) return 0 > baseCompare ? -1 : 1;
+  const aKey = bBase === aBase || b === aBase || aBase.startsWith(`${b}:`) ? aBase : a;
+  const bKey = aBase === bBase || a === bBase || bBase.startsWith(`${a}:`) ? bBase : b;
 
-  return a.localeCompare(b);
+  return aKey.localeCompare(bKey);
 }

src/package/scripts/script-comparator.test.js

@@ -14,6 +14,9 @@ describe('script name comparator', () => {
 
     expect(compareScriptNames(a, b)).toEqual(A_BEFORE_B);
     expect(compareScriptNames(b, a)).toEqual(A_AFTER_B);
+
+    expect(compareScriptNames('pebfifu', 'prepare')).toEqual(A_BEFORE_B);
+    expect(compareScriptNames('prepare', 'pebfifu')).toEqual(A_AFTER_B);
   });
 
   it('should sort `pre` scripts ahead of their related scripts', async () => {
@@ -33,6 +36,9 @@ describe('script name comparator', () => {
 
     expect(compareScriptNames('posttest', 'test')).toEqual(A_AFTER_B);
     expect(compareScriptNames('test', 'posttest')).toEqual(A_BEFORE_B);
+
+    expect(compareScriptNames(`postlint:${any.word()}`, `test:${any.word()}`)).toEqual(A_BEFORE_B);
+    expect(compareScriptNames(`test:${any.word()}`, `postlint:${any.word()}`)).toEqual(A_AFTER_B);
   });
 
   it('should sort the `test` script ahead of any sub-test scripts', async () => {