fix(scripts): another tweak to improve relating pre scripts with their base script

Author: travi

src/package/scripts/script-comparator.js

@@ -39,8 +39,8 @@ export default function compareScriptNames(a, b) {
   const aStripped = stripPrefix(a);
   const bStripped = stripPrefix(b);
 
-  const aKey = aStripped.startsWith(`${b}:`) ? aStripped : a;
-  const bKey = bStripped.startsWith(`${a}:`) ? bStripped : b;
+  const aKey = aStripped !== a ? aStripped : a;
+  const bKey = bStripped !== b ? bStripped : b;
 
   return aKey.localeCompare(bKey);
 }

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

@@ -14,9 +14,6 @@ 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 () => {
@@ -30,6 +27,14 @@ describe('script name comparator', () => {
     expect(compareScriptNames('lint:publish', 'prelint:publish')).toEqual(A_AFTER_B);
   });
 
+  it('should sort a `pre` script directly before its base script relative to unrelated scripts', async () => {
+    const baseName = `b${any.word()}`;
+    const scriptBetween = `c${any.word()}`;
+
+    expect(compareScriptNames(`pre${baseName}`, scriptBetween)).toEqual(A_BEFORE_B);
+    expect(compareScriptNames(scriptBetween, `pre${baseName}`)).toEqual(A_AFTER_B);
+  });
+
   it('should sort `post` scripts after of their related scripts', async () => {
     expect(compareScriptNames(`post${baseScriptName}`, baseScriptName)).toEqual(A_AFTER_B);
     expect(compareScriptNames(baseScriptName, `post${baseScriptName}`)).toEqual(A_BEFORE_B);

test/integration/features/step_definitions/scripts-steps.js

@@ -6,6 +6,7 @@ import {Before, Given, Then} from '@cucumber/cucumber';
 Before(function () {
   this.existingScripts = {
     aaa: any.string(),
+    ccc: any.string(),
     zzz: any.string(),
     test: any.string(),
     'lint:md': any.string(),
@@ -109,6 +110,7 @@ Then('the scripts are ordered correctly', async function () {
       'aaa',
       'prebuild',
       'build',
+      'ccc',
       'prepare',
       'zzz'
     ]