polish; org as alias for defaultOrg, hide json command, drop "default" from banner, add socket org deps alias

Author: pvdz

src/commands/json/cmd-json.mts

@@ -10,7 +10,7 @@ const config: CliCommandConfig = {
   commandName: 'json',
   description:
     'Display the `socket.json` that would be applied for target folder',
-  hidden: false,
+  hidden: true,
   flags: {
     ...commonFlags,
   },

src/commands/organization/cmd-organization.mts

@@ -23,6 +23,11 @@ export const cmdOrganization: CliSubcommand = {
       },
       {
         aliases: {
+          deps: {
+            description: cmdOrganizationDependencies.description,
+            hidden: true,
+            argv: ['dependencies'],
+          },
           license: {
             description: cmdOrganizationPolicyLicense.description,
             hidden: true,
@@ -36,7 +41,6 @@ export const cmdOrganization: CliSubcommand = {
         },
         argv,
         description,
-        defaultSub: 'list', // Backwards compat
         importMeta,
         name: parentName + ' organization',
       },

src/utils/config.mts

@@ -20,6 +20,7 @@ export interface LocalConfig {
   apiToken?: string | null | undefined
   defaultOrg?: string
   enforcedOrgs?: string[] | readonly string[] | null | undefined
+  org?: string // convenience alias for defaultOrg
 }
 
 export const sensitiveConfigKeys: Set<keyof LocalConfig> = new Set(['apiToken'])
@@ -36,6 +37,7 @@ export const supportedConfigKeys: Map<keyof LocalConfig, string> = new Map([
     'enforcedOrgs',
     'Orgs in this list have their security policies enforced on this machine',
   ],
+  ['org', 'Alias for defaultOrg'],
 ])
 
 function getConfigValues(): LocalConfig {
@@ -75,15 +77,17 @@ function normalizeConfigKey(
 ): CResult<keyof LocalConfig> {
   // Note: apiKey was the old name of the token. When we load a config with
   //       property apiKey, we'll copy that to apiToken and delete the old property.
-  const normalizedKey = key === 'apiKey' ? 'apiToken' : key
+  // We added `org` as a convenience alias for `defaultOrg`
+  const normalizedKey =
+    key === 'apiKey' ? 'apiToken' : key === 'org' ? 'defaultOrg' : key
   if (!supportedConfigKeys.has(normalizedKey)) {
     return {
       ok: false,
       message: `Invalid config key: ${normalizedKey}`,
       data: undefined,
     }
   }
-  return { ok: true, data: key }
+  return { ok: true, data: normalizedKey }
 }
 
 export function findSocketYmlSync(dir = process.cwd()) {
@@ -175,7 +179,7 @@ export function overrideCachedConfig(jsonConfig: unknown): CResult<undefined> {
   _cachedConfig = config as LocalConfig
   _readOnlyConfig = true
 
-  // Normalize apiKey to apiToken.
+  // Normalize apiKey to apiToken
   if (_cachedConfig['apiKey']) {
     if (_cachedConfig['apiToken']) {
       logger.warn(
@@ -214,7 +218,7 @@ export function updateConfigValue<Key extends keyof LocalConfig>(
   if (_readOnlyConfig) {
     return {
       ok: true,
-      message: `Config key '${key}' was updated`,
+      message: `Config key '${keyResult.data}' was updated`,
       data: 'Change applied but not persisted; current config is overridden through env var or flag',
     }
   }
@@ -236,7 +240,7 @@ export function updateConfigValue<Key extends keyof LocalConfig>(
 
   return {
     ok: true,
-    message: `Config key '${key}' was updated`,
+    message: `Config key '${keyResult.data}' was updated`,
     data: undefined,
   }
 }

src/utils/meow-with-subcommands.mts

@@ -252,7 +252,6 @@ export async function meowWithSubcommands(
       'analytics',
       'audit-log',
       'config',
-      'dependencies',
       'fix',
       'install',
       'login',
@@ -529,7 +528,7 @@ function getAsciiHeader(command: string) {
   const body = `
    _____         _       _        /---------------
   |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver ${cliVersion}
-  |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, default org: ${redacting ? REDACTED : defaultOrg}` : ''}
+  |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, org: ${redacting ? REDACTED : defaultOrg}` : ''}
   |_____|___|___|_,_|___|_|.dev   | Command: \`${command}\`, cwd: ${relCwd}`.trimStart()
 
   return `   ${body}\n${nodeVerWarn}`