Use more objectEntries and objectFromEntries

Author: jdalton

src/cli.ts

@@ -3,6 +3,10 @@
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 
+import {
+  objectEntries,
+  objectFromEntries
+} from '@socketsecurity/registry/lib/objects'
 import chalk from 'chalk'
 import { messageWithCauses, stackWithCauses } from 'pony-cause'
 import updateNotifier from 'tiny-updater'
@@ -18,9 +22,10 @@ const rootPkgJsonPath = path.join(rootPath, 'package.json')
 
 const rootPkgJson = require(rootPkgJsonPath)
 
-const formattedCliCommands = Object.fromEntries(
-  Object.entries(cliCommands).map(entry => {
-    entry[0] = camelToHyphen(entry[0])
+const formattedCliCommands = objectFromEntries(
+  objectEntries(cliCommands).map(entry => {
+    const key = entry[0]
+    entry[0] = typeof key === 'string' ? camelToHyphen(key) : key
     return entry
   })
 )

src/commands/cdxgen.ts

@@ -2,6 +2,7 @@ import { existsSync, promises as fs } from 'node:fs'
 import path from 'node:path'
 
 import spawn from '@npmcli/promise-spawn'
+import { objectEntries } from '@socketsecurity/registry/lib/objects'
 import chalk from 'chalk'
 import yargsParse from 'yargs-parser'
 
@@ -129,18 +130,18 @@ function argvToArray(argv: {
 }): string[] {
   if (argv['help']) return ['--help']
   const result = []
-  for (const { 0: key, 1: value } of Object.entries(argv)) {
+  for (const { 0: key, 1: value } of objectEntries(argv)) {
     if (key === '_' || key === '--') continue
     if (key === 'babel' || key === 'install-deps' || key === 'validate') {
       // cdxgen documents no-babel, no-install-deps, and no-validate flags so
       // use them when relevant.
       result.push(`--${value ? key : `no-${key}`}`)
     } else if (value === true) {
-      result.push(`--${key}`)
+      result.push(`--${String(key)}`)
     } else if (typeof value === 'string') {
-      result.push(`--${key}`, String(value))
+      result.push(`--${String(key)}`, String(value))
     } else if (Array.isArray(value)) {
-      result.push(`--${key}`, ...value.map(String))
+      result.push(`--${String(key)}`, ...value.map(String))
     }
   }
   if (argv['--']) {

src/commands/optimize.ts

@@ -4,23 +4,26 @@ import path from 'node:path'
 import spawn from '@npmcli/promise-spawn'
 import EditablePackageJson from '@npmcli/package-json'
 import { getManifestData } from '@socketsecurity/registry'
-//import cacache from 'cacache'
+import {
+  hasOwn,
+  objectFromEntries,
+  toSortedObject
+} from '@socketsecurity/registry/lib/objects'
+import { fetchPackageManifest } from '@socketsecurity/registry/lib/packages'
+import { pEach } from '@socketsecurity/registry/lib/promises'
+import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
+import { isNonEmptyString } from '@socketsecurity/registry/lib/strings'
 import meow from 'meow'
 import npa from 'npm-package-arg'
 import ora from 'ora'
 import semver from 'semver'
 import { glob as tinyGlob } from 'tinyglobby'
 import { parse as yamlParse } from 'yaml'
 
-import { fetchPackageManifest } from '@socketsecurity/registry/lib/packages'
 import { commonFlags } from '../flags'
 import { printFlagList } from '../utils/formatting'
 import { existsSync } from '../utils/fs'
-import { hasOwn, toSortedObject } from '@socketsecurity/registry/lib/objects'
 import { detect } from '../utils/package-manager-detector'
-import { pEach } from '@socketsecurity/registry/lib/promises'
-import { escapeRegExp } from '@socketsecurity/registry/lib/regexps'
-import { isNonEmptyString } from '@socketsecurity/registry/lib/strings'
 
 import type { Content as NPMCliPackageJson } from '@npmcli/package-json'
 import type { ManifestEntry } from '@socketsecurity/registry'
@@ -618,7 +621,7 @@ async function addOverrides(
     })
   }
   if (state.added.size > 0 || state.updated.size > 0) {
-    editablePkgJson.update(<NPMCliPackageJson>Object.fromEntries(depEntries))
+    editablePkgJson.update(<NPMCliPackageJson>objectFromEntries(depEntries))
     for (const { overrides, type } of overridesDataObjects) {
       updateManifestByAgent[type](editablePkgJson, toSortedObject(overrides))
     }