Use more Array.from

Author: jdalton

src/commands/fix/npm-fix.mts

@@ -166,8 +166,8 @@ export async function npmFix(
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename!,
   ]
-  const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) =>
-    naturalCompare(a[0], b[0]),
+  const sortedInfoEntries = Array.from(infoByPartialPurl.entries()).sort(
+    (a, b) => naturalCompare(a[0], b[0]),
   )
 
   const cleanupInfoEntriesLoop = () => {
@@ -197,7 +197,7 @@ export async function npmFix(
     const partialPurlObj = getPurlObject(infoEntry[0])
     const name = resolvePackageName(partialPurlObj)
 
-    const infos = [...infoEntry[1].values()]
+    const infos = Array.from(infoEntry[1].values())
     if (!infos.length) {
       continue infoEntriesLoop
     }

src/commands/fix/open-pr.mts

@@ -213,7 +213,9 @@ export async function cleanupOpenPrs(
 
   if (cachesToSave.size) {
     await Promise.allSettled(
-      [...cachesToSave].map(({ 0: key, 1: data }) => writeCache(key, data)),
+      Array.from(cachesToSave).map(({ 0: key, 1: data }) =>
+        writeCache(key, data),
+      ),
     )
   }
 

src/commands/fix/pnpm-fix.mts

@@ -242,8 +242,8 @@ export async function pnpmFix(
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename!,
   ]
-  const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) =>
-    naturalCompare(a[0], b[0]),
+  const sortedInfoEntries = Array.from(infoByPartialPurl.entries()).sort(
+    (a, b) => naturalCompare(a[0], b[0]),
   )
 
   const cleanupInfoEntriesLoop = () => {
@@ -273,7 +273,7 @@ export async function pnpmFix(
     const partialPurlObj = getPurlObject(infoEntry[0])
     const name = resolvePackageName(partialPurlObj)
 
-    const infos = [...infoEntry[1].values()]
+    const infos = Array.from(infoEntry[1].values())
     if (!infos.length) {
       continue infoEntriesLoop
     }

src/commands/optimize/ls-by-agent.mts

@@ -30,7 +30,7 @@ function cleanupQueryStdout(stdout: string): string {
       names.add(resolvedName)
     }
   }
-  return JSON.stringify([...names], null, 2)
+  return JSON.stringify(Array.from(names), null, 2)
 }
 
 function parsableToQueryStdout(stdout: string) {
@@ -41,7 +41,7 @@ function parsableToQueryStdout(stdout: string) {
   // The matchAll regexp looks for a forward (posix) or backward (win32) slash
   // and matches one or more non-slashes until the newline.
   const names = new Set(stdout.matchAll(/(?<=[/\\])[^/\\]+(?=\n)/g))
-  return JSON.stringify([...names], null, 2)
+  return JSON.stringify(Array.from(names), null, 2)
 }
 
 async function npmQuery(npmExecPath: string, cwd: string): Promise<string> {

src/shadow/npm/arborist-helpers.mts

@@ -201,7 +201,7 @@ export async function getAlertsMapFromArborist(
   )?.overrides?.children
   if (overridesMap) {
     overrides = Object.fromEntries(
-      [...overridesMap.entries()].map(([key, overrideSet]) => {
+      Array.from(overridesMap.entries()).map(([key, overrideSet]) => {
         return [key, overrideSet.value!]
       }),
     )

src/utils/pnpm.mts

@@ -49,7 +49,7 @@ export async function extractPurlsFromPnpmLockfile(
   for (const pkgPath of Object.keys(packages)) {
     visit(pkgPath)
   }
-  return [...seen].map(p =>
+  return Array.from(seen).map(p =>
     idToNpmPurl(stripPnpmPeerSuffix(stripLeadingPnpmDepPathSlash(p))),
   )
 }

src/utils/semver.mts

@@ -35,7 +35,7 @@ export function applyRange(
     case 'preserve': {
       const range = new semver.Range(refRange)
       const { raw } = range
-      const comparators = [...range.set].flat()
+      const comparators = range.set.flat()
       const { length } = comparators
       if (length === 1) {
         const char = /^[<>]=?/.exec(raw)?.[0]

src/utils/socket-package-alert.mts

@@ -261,10 +261,10 @@ export async function addArtifactToAlertsMap<T extends AlertsByPurl>(
     }
     sockPkgAlerts = [
       // Sort CVE alerts by severity: critical, high, middle, then low.
-      ...[...highestForCve.values()]
+      ...Array.from(highestForCve.values())
         .map(d => d.alert)
         .sort(alertSeverityComparator),
-      ...[...highestForUpgrade.values()].map(d => d.alert),
+      ...Array.from(highestForUpgrade.values()).map(d => d.alert),
       ...unfixableAlerts,
     ]
   } else {
@@ -448,7 +448,7 @@ export function logAlertsMap(
   } as LogAlertsMapOptions
 
   const translations = getTranslations()
-  const sortedEntries = [...alertsMap.entries()].sort(
+  const sortedEntries = Array.from(alertsMap.entries()).sort(
     (a, b) => getAlertsSeverityOrder(a[1]) - getAlertsSeverityOrder(b[1]),
   )
 
@@ -522,7 +522,7 @@ export function logAlertsMap(
   for (
     let i = 0,
       prevAboveTheFold = true,
-      entries = [...viewableAlertsByPurl.entries()],
+      entries = Array.from(viewableAlertsByPurl.entries()),
       { length } = entries;
     i < length;
     i += 1