refactor: simplify getPackageName and fix tests (#347)

Author: fisker

index.js

@@ -90,23 +90,17 @@ const sortObjectBySemver = sortObjectBy((a, b) => {
 })
 
 const getPackageName = (ident) => {
-  const parts = ident.split('@')
-
-  if (ident.startsWith('@')) {
-    // Handle cases where package name starts with '@'
-    return parts.length > 2 ? parts.slice(0, -1).join('@') : ident
-  }
-
-  // Handle cases where package name doesn't start with '@'
-  return parts.length > 1 ? parts.slice(0, -1).join('@') : ident
+  const index = ident.indexOf('@', ident.startsWith('@') ? 1 : 0)
+  // This should not happen, unless user manually edit the package.json file
+  return index === -1 ? ident : ident.slice(0, index)
 }
 
 const sortObjectByIdent = (a, b) => {
-  const PackageNameA = getPackageName(a)
-  const PackageNameB = getPackageName(b)
+  const packageNameA = getPackageName(a)
+  const packageNameB = getPackageName(b)
 
-  if (PackageNameA < PackageNameB) return -1
-  if (PackageNameA > PackageNameB) return 1
+  if (packageNameA < packageNameB) return -1
+  if (packageNameA > packageNameB) return 1
   return 0
 }
 

tests/_helpers.js

@@ -67,14 +67,14 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
       ...options,
       value: keysToObject(
         [
-          '@[email protected]',
+          '@z-package/package@1.2.3',
           '[email protected]',
           '[email protected]',
-          '@[email protected]',
+          '@a-package/package@1.2.3',
           '[email protected]',
-          '@b-package',
-          '@[email protected]',
-          '@[email protected]',
+          '@b-package/package',
+          '@e-package/package@1.2.3',
+          '@ch-package/package@1.2.3',
           '[email protected]',
           '[email protected]',
         ],
@@ -84,11 +84,11 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
         expect ||
         keysToObject(
           [
-            '@[email protected]',
-            '@b-package',
-            '@[email protected]',
-            '@[email protected]',
-            '@[email protected]',
+            '@a-package/package@1.2.3',
+            '@b-package/package',
+            '@ch-package/package@1.2.3',
+            '@e-package/package@1.2.3',
+            '@z-package/package@1.2.3',
             '[email protected]',
             '[email protected]',
             '[email protected]',