chore: Revert "move to ESM and upgrade deps"

This reverts commit 0a305ea.

package.json

@@ -2,7 +2,6 @@
   "name": "google-cloud-sql",
   "version": "1.7.1",
   "description": "Connect to private Google Cloud SQL instance through Cloud SQL Auth Proxy running in GKE cluster.",
-  "type": "module",
   "license": "UNLICENSED",
   "author": "Dinko Osrecki <[email protected]>",
   "homepage": "https://github.com/edosrecki/google-cloud-sql-cli",
@@ -29,36 +28,36 @@
     "prettify-package-json": "prettier-package-json --write"
   },
   "dependencies": {
-    "boxen": "7.0.0",
-    "chalk": "5.1.2",
-    "commander": "9.4.1",
+    "boxen": "5.1.2",
+    "chalk": "4.1.2",
+    "commander": "8.3.0",
     "conf": "10.2.0",
-    "exit-hook": "3.1.2",
+    "exit-hook": "2.2.1",
     "fuse.js": "6.6.2",
-    "inquirer": "9.1.4",
-    "inquirer-autocomplete-prompt": "3.0.0",
+    "inquirer": "8.2.5",
+    "inquirer-autocomplete-prompt": "1.4.0",
     "lodash": "4.17.21",
     "memoizee": "0.4.15",
     "shelljs": "0.8.5",
-    "update-notifier": "6.0.2"
+    "update-notifier": "5.1.0"
   },
   "devDependencies": {
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@tsconfig/node18": "1.0.1",
-    "@types/inquirer": "9.0.2",
-    "@types/inquirer-autocomplete-prompt": "3.0.0",
+    "@types/inquirer": "8.2.4",
+    "@types/inquirer-autocomplete-prompt": "1.3.5",
     "@types/lodash": "4.14.187",
     "@types/memoizee": "0.4.8",
     "@types/node": "18.11.9",
     "@types/shelljs": "0.8.11",
-    "@types/update-notifier": "6.0.1",
+    "@types/update-notifier": "5.1.0",
     "@typescript-eslint/eslint-plugin": "5.42.0",
     "@typescript-eslint/parser": "5.42.0",
     "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
-    "husky": "8.0.1",
+    "husky": "7.0.4",
     "pkg": "5.8.0",
     "prettier-package-json": "2.7.0",
     "rimraf": "3.0.2",

src/commands/configurations/create.ts

@@ -1,16 +1,16 @@
-import chalk from 'chalk'
+import { bold, green, red } from 'chalk'
 import inquirer from 'inquirer'
 import autocomplete from 'inquirer-autocomplete-prompt'
-import { saveConfiguration } from '../../lib/configurations/index.js'
-import { ConfigurationCreateAnswers } from '../../lib/types.js'
-import { configurationNamePrompt } from './prompts/configuration-name.js'
-import { confirmationPrompt } from './prompts/confirmation.js'
-import { googleCloudProjectPrompt } from './prompts/google-cloud-project.js'
-import { googleCloudSqlInstancePrompt } from './prompts/google-cloud-sql-instance.js'
-import { kubernetesContextPrompt } from './prompts/kubernetes-context.js'
-import { kubernetesNamespacePrompt } from './prompts/kubernetes-namespace.js'
-import { kubernetesServiceAccountPrompt } from './prompts/kubernetes-service-account.js'
-import { localPortPrompt } from './prompts/local-port.js'
+import { saveConfiguration } from '../../lib/configurations'
+import { ConfigurationCreateAnswers } from '../../lib/types'
+import { configurationNamePrompt } from './prompts/configuration-name'
+import { confirmationPrompt } from './prompts/confirmation'
+import { googleCloudProjectPrompt } from './prompts/google-cloud-project'
+import { googleCloudSqlInstancePrompt } from './prompts/google-cloud-sql-instance'
+import { kubernetesContextPrompt } from './prompts/kubernetes-context'
+import { kubernetesNamespacePrompt } from './prompts/kubernetes-namespace'
+import { kubernetesServiceAccountPrompt } from './prompts/kubernetes-service-account'
+import { localPortPrompt } from './prompts/local-port'
 
 export const createConfiguration = async () => {
   inquirer.registerPrompt('autocomplete', autocomplete)
@@ -29,8 +29,8 @@ export const createConfiguration = async () => {
   if (answers.confirmation) {
     saveConfiguration(answers)
 
-    console.log(chalk.green(`Saved configuration '${chalk.bold(answers.configurationName)}'.`))
+    console.log(green(`Saved configuration '${bold(answers.configurationName)}'.`))
   } else {
-    console.log(chalk.red('You are excused.'))
+    console.log(red('You are excused.'))
   }
 }

src/commands/configurations/index.ts

@@ -1,10 +1,10 @@
 import { Command } from 'commander'
-import { logError } from '../../lib/util/error.js'
-import { createConfiguration } from './create.js'
-import { showConfigurationPath } from './path.js'
-import { removeConfiguration } from './remove.js'
-import { runConfiguration, runConfigurationByName } from './run.js'
-import { showConfiguration } from './show.js'
+import { logError } from '../../lib/util/error'
+import { createConfiguration } from './create'
+import { showConfigurationPath } from './path'
+import { removeConfiguration } from './remove'
+import { runConfiguration, runConfigurationByName } from './run'
+import { showConfiguration } from './show'
 
 export async function addConfigurationsCommands(program: Command) {
   const configurations = new Command('configurations')

src/commands/configurations/path.ts

@@ -1,6 +1,6 @@
-import chalk from 'chalk'
-import { configurationPath } from '../../lib/configurations/index.js'
+import { bold } from 'chalk'
+import { configurationPath } from '../../lib/configurations'
 
 export const showConfigurationPath = () => {
-  console.log(chalk.bold(configurationPath))
+  console.log(bold(configurationPath))
 }

src/commands/configurations/prompts/configuration.ts

@@ -1,7 +1,7 @@
-import { getConfigurations } from '../../../lib/configurations/index.js'
-import { Configuration, ConfigurationChooseAnswers } from '../../../lib/types.js'
-import { searchByKey } from '../../../lib/util/search.js'
-import { tryCatch } from '../../../lib/util/error.js'
+import { getConfigurations } from '../../../lib/configurations'
+import { Configuration, ConfigurationChooseAnswers } from '../../../lib/types'
+import { searchByKey } from '../../../lib/util/search'
+import { tryCatch } from '../../../lib/util/error'
 
 const formatConfiguration = (configuration: Configuration) => {
   return {

src/commands/configurations/prompts/google-cloud-project.ts

@@ -1,7 +1,7 @@
-import { fetchGoogleCloudProjects } from '../../../lib/gcloud/projects.js'
-import { ConfigurationCreateAnswers } from '../../../lib/types.js'
-import { tryCatch } from '../../../lib/util/error.js'
-import { search } from '../../../lib/util/search.js'
+import { fetchGoogleCloudProjects } from '../../../lib/gcloud/projects'
+import { ConfigurationCreateAnswers } from '../../../lib/types'
+import { tryCatch } from '../../../lib/util/error'
+import { search } from '../../../lib/util/search'
 
 const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
   const projects = fetchGoogleCloudProjects()

src/commands/configurations/prompts/google-cloud-sql-instance.ts

@@ -1,18 +1,18 @@
-import _ from 'lodash'
+import { pick } from 'lodash'
 import {
   fetchGoogleCloudSqlInstances,
   GoogleCloudSqlInstance,
-} from '../../../lib/gcloud/sql-instances.js'
-import { ConfigurationCreateAnswers } from '../../../lib/types.js'
-import { searchByKey } from '../../../lib/util/search.js'
-import { tryCatch } from '../../../lib/util/error.js'
+} from '../../../lib/gcloud/sql-instances'
+import { ConfigurationCreateAnswers } from '../../../lib/types'
+import { searchByKey } from '../../../lib/util/search'
+import { tryCatch } from '../../../lib/util/error'
 
 const formatInstance = (instance: GoogleCloudSqlInstance) => {
   const { name, region } = instance
   return {
     name: `${name} (${region})`,
     short: name,
-    value: _.pick(instance, 'connectionName', 'port'),
+    value: pick(instance, 'connectionName', 'port'),
   }
 }
 

src/commands/configurations/prompts/kubernetes-context.ts

@@ -1,7 +1,7 @@
-import { fetchKubernetesContexts } from '../../../lib/kubectl/contexts.js'
-import { ConfigurationCreateAnswers } from '../../../lib/types.js'
-import { search } from '../../../lib/util/search.js'
-import { tryCatch } from '../../../lib/util/error.js'
+import { fetchKubernetesContexts } from '../../../lib/kubectl/contexts'
+import { ConfigurationCreateAnswers } from '../../../lib/types'
+import { search } from '../../../lib/util/search'
+import { tryCatch } from '../../../lib/util/error'
 
 const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
   const instances = fetchKubernetesContexts()

src/commands/configurations/prompts/kubernetes-namespace.ts

@@ -1,7 +1,7 @@
-import { fetchKubernetesNamespaces } from '../../../lib/kubectl/namespaces.js'
-import { ConfigurationCreateAnswers } from '../../../lib/types.js'
-import { search } from '../../../lib/util/search.js'
-import { tryCatch } from '../../../lib/util/error.js'
+import { fetchKubernetesNamespaces } from '../../../lib/kubectl/namespaces'
+import { ConfigurationCreateAnswers } from '../../../lib/types'
+import { search } from '../../../lib/util/search'
+import { tryCatch } from '../../../lib/util/error'
 
 const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
   const instances = fetchKubernetesNamespaces(answers.kubernetesContext)

src/commands/configurations/prompts/kubernetes-service-account.ts

@@ -1,7 +1,7 @@
-import { fetchKubernetesServiceAccounts } from '../../../lib/kubectl/service-accounts.js'
-import { ConfigurationCreateAnswers } from '../../../lib/types.js'
-import { search } from '../../../lib/util/search.js'
-import { tryCatch } from '../../../lib/util/error.js'
+import { fetchKubernetesServiceAccounts } from '../../../lib/kubectl/service-accounts'
+import { ConfigurationCreateAnswers } from '../../../lib/types'
+import { search } from '../../../lib/util/search'
+import { tryCatch } from '../../../lib/util/error'
 
 const source = tryCatch((answers: ConfigurationCreateAnswers, input?: string) => {
   const instances = fetchKubernetesServiceAccounts(

src/commands/configurations/remove.ts

@@ -1,10 +1,10 @@
-import chalk from 'chalk'
+import { green, red, bold } from 'chalk'
 import inquirer from 'inquirer'
 import autocomplete from 'inquirer-autocomplete-prompt'
-import { deleteConfiguration } from '../../lib/configurations/index.js'
-import { ConfigurationChooseAnswers } from '../../lib/types.js'
-import { configurationPrompt } from './prompts/configuration.js'
-import { confirmationPrompt } from './prompts/confirmation.js'
+import { deleteConfiguration } from '../../lib/configurations'
+import { ConfigurationChooseAnswers } from '../../lib/types'
+import { configurationPrompt } from './prompts/configuration'
+import { confirmationPrompt } from './prompts/confirmation'
 
 export const removeConfiguration = async () => {
   inquirer.registerPrompt('autocomplete', autocomplete)
@@ -19,9 +19,9 @@ export const removeConfiguration = async () => {
     deleteConfiguration(configuration.configurationName)
 
     console.log(
-      chalk.green(`Deleted configuration '${chalk.bold(configuration.configurationName)}'.`)
+      green(`Deleted configuration '${bold(configuration.configurationName)}'.`)
     )
   } else {
-    console.log(chalk.red('You are excused.'))
+    console.log(red('You are excused.'))
   }
 }

src/commands/configurations/run.ts

@@ -1,10 +1,10 @@
-import chalk from 'chalk'
+import { red } from 'chalk'
 import inquirer from 'inquirer'
 import autocomplete from 'inquirer-autocomplete-prompt'
-import { execConfiguration, getConfiguration } from '../../lib/configurations/index.js'
-import { ConfigurationChooseAnswers } from '../../lib/types.js'
-import { configurationPrompt } from './prompts/configuration.js'
-import { confirmationPrompt } from './prompts/confirmation.js'
+import { execConfiguration, getConfiguration } from '../../lib/configurations'
+import { ConfigurationChooseAnswers } from '../../lib/types'
+import { configurationPrompt } from './prompts/configuration'
+import { confirmationPrompt } from './prompts/confirmation'
 
 export const runConfiguration = async () => {
   inquirer.registerPrompt('autocomplete', autocomplete)
@@ -18,7 +18,7 @@ export const runConfiguration = async () => {
   if (confirmation) {
     execConfiguration(configuration)
   } else {
-    console.log(chalk.red('You are excused.'))
+    console.log(red('You are excused.'))
   }
 }
 

src/commands/configurations/show.ts

@@ -1,7 +1,7 @@
 import inquirer from 'inquirer'
 import autocomplete from 'inquirer-autocomplete-prompt'
-import { ConfigurationChooseAnswers } from '../../lib/types.js'
-import { configurationPrompt } from './prompts/configuration.js'
+import { ConfigurationChooseAnswers } from '../../lib/types'
+import { configurationPrompt } from './prompts/configuration'
 
 export const showConfiguration = async () => {
   inquirer.registerPrompt('autocomplete', autocomplete)

src/index.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander'
-import { addConfigurationsCommands } from './commands/configurations/index.js'
-import { notifyForUpdates } from './lib/updates.js'
-import { version } from './lib/version.js'
+import { addConfigurationsCommands } from './commands/configurations'
+import { notifyForUpdates } from './lib/updates'
+import { version } from './lib/version'
 
 async function main() {
   notifyForUpdates()

src/lib/configurations/index.ts

@@ -1,15 +1,15 @@
 import exitHook from 'exit-hook'
-import _ from 'lodash'
+import { omit } from 'lodash'
 import {
   deletePod,
   portForward,
   runCloudSqlProxyPod,
   waitForPodReady,
-} from '../kubectl/pods.js'
-import { Configuration, ConfigurationCreateAnswers } from '../types.js'
-import { appendOrReplaceByKey, deleteByKey, findByKey } from '../util/array.js'
-import { randomString } from '../util/string.js'
-import { store } from './store.js'
+} from '../kubectl/pods'
+import { Configuration, ConfigurationCreateAnswers } from '../types'
+import { appendOrReplaceByKey, deleteByKey, findByKey } from '../util/array'
+import { randomString } from '../util/string'
+import { store } from './store'
 
 const storeKey = 'configurations' as const
 const searchKey = 'configurationName' as const
@@ -25,7 +25,7 @@ export const getConfiguration = (name: string): Configuration | undefined => {
 }
 
 export const saveConfiguration = (answers: ConfigurationCreateAnswers): void => {
-  const configuration = _.omit(answers, excludeProperties)
+  const configuration = omit(answers, excludeProperties)
 
   const configurations = store.get(storeKey)
   appendOrReplaceByKey(configurations, configuration, searchKey)

src/lib/configurations/store.ts

@@ -1,5 +1,5 @@
 import Conf from 'conf'
-import { Configuration } from '../types.js'
+import { Configuration } from '../types'
 
 type Schema = {
   configurations: Configuration[]

src/lib/gcloud/projects.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee'
-import { execCommandMultiline } from '../util/exec.js'
+import { execCommandMultiline } from '../util/exec'
 
 export const fetchGoogleCloudProjects = memoize((): string[] => {
   return execCommandMultiline(`

src/lib/gcloud/sql-instances.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee'
-import { execCommandMultiline } from '../util/exec.js'
+import { execCommandMultiline } from '../util/exec'
 
 export type GoogleCloudSqlInstance = {
   name: string

src/lib/kubectl/contexts.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee'
-import { execCommand, execCommandMultiline } from '../util/exec.js'
+import { execCommand, execCommandMultiline } from '../util/exec'
 
 export const fetchKubernetesCurrentContext = (): string => {
   return execCommand(`kubectl config current-context`)

src/lib/kubectl/namespaces.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee'
-import { execCommandMultiline } from '../util/exec.js'
+import { execCommandMultiline } from '../util/exec'
 
 export const fetchKubernetesNamespaces = memoize((context: string): string[] => {
   return execCommandMultiline(`

src/lib/kubectl/pods.ts

@@ -1,5 +1,5 @@
-import chalk from 'chalk'
-import { execCommand, execCommandAttached } from '../util/exec.js'
+import { bold, cyan } from 'chalk'
+import { execCommand, execCommandAttached } from '../util/exec'
 
 type CloudSqlProxyPod = {
   name: string
@@ -26,28 +26,28 @@ export const runCloudSqlProxyPod = (pod: CloudSqlProxyPod): string => {
 }
 
 export const deletePod = (pod: CloudSqlProxyPod) => {
-  console.log(`Deleting pod '${chalk.bold.cyan(pod.name)}'.`)
+  console.log(`Deleting pod '${bold(cyan(pod.name))}'.`)
   execCommand(`
     kubectl delete pod ${pod.name} \
       --context="${pod.context}" \
       --namespace="${pod.namespace}"
   `)
-  console.log(`Pod '${chalk.cyan(pod.name)}' deleted.`)
+  console.log(`Pod '${bold(cyan(pod.name))}' deleted.`)
 }
 
 export const waitForPodReady = (pod: CloudSqlProxyPod) => {
-  console.log(`Waiting for pod '${chalk.bold.cyan(pod.name)}'.`)
+  console.log(`Waiting for pod '${bold(cyan(pod.name))}'.`)
   execCommand(`
     kubectl wait pod ${pod.name} \
       --for=condition=ready \
       --context="${pod.context}" \
       --namespace="${pod.namespace}"
   `)
-  console.log(`Pod '${chalk.bold.cyan(pod.name)}' is ready.`)
+  console.log(`Pod '${bold(cyan(pod.name))}' is ready.`)
 }
 
 export const portForward = (pod: CloudSqlProxyPod) => {
-  console.log(`Starting port forwarding to pod '${chalk.bold.cyan(pod.name)}'.`)
+  console.log(`Starting port forwarding to pod '${bold(cyan(pod.name))}'.`)
   execCommandAttached(`
     kubectl port-forward ${pod.name} ${pod.localPort}:${pod.remotePort} \
       --context="${pod.context}" \

src/lib/kubectl/service-accounts.ts

@@ -1,5 +1,5 @@
 import memoize from 'memoizee'
-import { execCommandMultiline } from '../util/exec.js'
+import { execCommandMultiline } from '../util/exec'
 
 export const fetchKubernetesServiceAccounts = memoize(
   (context: string, namespace: string): string[] => {