Cleanup reify

Author: jdalton

src/shadow/arborist/lib/arborist/alerts.ts

@@ -124,12 +124,18 @@ function toRepoUrl(resolved: string): string {
 
 export type WalkOptions = { fix?: boolean }
 
-export function walk(diff_: Diff, options?: WalkOptions): InstallEffect[] {
+export function walk(
+  diff_: Diff | null,
+  options?: WalkOptions
+): InstallEffect[] {
   const { fix = ENV[SOCKET_CLI_FIX_PACKAGE_LOCK_FILE] } = <WalkOptions>{
     __proto__: null,
     ...options
   }
   const needInfoOn: InstallEffect[] = []
+  if (!diff_) {
+    return needInfoOn
+  }
   const queue: Diff[] = [...diff_.children]
   let pos = 0
   let { length: queueLength } = queue

src/shadow/arborist/lib/arborist/reify.ts

@@ -196,17 +196,17 @@ async function getPackagesAlerts(
         const lines = new Set()
         const translations = getTranslations()
         for (const alert of alerts) {
-          // Based data from { pageProps: { alertTypes } } of:
-          // https://socket.dev/_next/data/94666139314b6437ee4491a0864e72b264547585/en-US.json
-          const info = (translations.alerts as any)[alert.type]
-          const title = info?.title ?? alert.type
           const attributes = [
             ...(alert.fixable ? ['fixable'] : []),
             ...(alert.block ? [] : ['non-blocking'])
           ]
           const maybeAttributes = attributes.length
             ? ` (${attributes.join('; ')})`
             : ''
+          // Based data from { pageProps: { alertTypes } } of:
+          // https://socket.dev/_next/data/94666139314b6437ee4491a0864e72b264547585/en-US.json
+          const info = (translations.alerts as any)[alert.type]
+          const title = info?.title ?? alert.type
           const maybeDesc = info?.description ? ` - ${info.description}` : ''
           // TODO: emoji seems to mis-align terminals sometimes
           lines.add(`  ${title}${maybeAttributes}${maybeDesc}\n`)
@@ -362,8 +362,11 @@ export async function reify(
 ): Promise<SafeNode> {
   // `this.diff` is `null` when `options.packageLockOnly`, --package-lock-only,
   // is `true`.
-  const needInfoOn = this.diff ? walk(this.diff) : []
-  if (needInfoOn.findIndex(c => c.repository_url === NPM_REGISTRY_URL) === -1) {
+  const needInfoOn = walk(this.diff)
+  if (
+    needInfoOn.length! ||
+    needInfoOn.findIndex(c => c.repository_url === NPM_REGISTRY_URL) === -1
+  ) {
     // Nothing to check, hmmm already installed or all private?
     return await this[kRiskyReify](...args)
   }
@@ -413,11 +416,9 @@ export async function reify(
         ret = await this[kRiskyReify](...args)
         await this.loadActual()
         await this.buildIdealTree()
-        alerts = await getPackagesAlerts(
-          this,
-          this.diff ? walk(this.diff, { fix: true }) : [],
-          { fixable: true }
-        )
+        alerts = await getPackagesAlerts(this, walk(this.diff, { fix: true }), {
+          fixable: true
+        })
         alerts = alerts.filter(a => {
           const { key } = a
           if (prev.has(key)) {