test esm changes

Author: eablack

examples/favorites.ts

@@ -1,6 +1,6 @@
 import {ux} from '@oclif/core'
 
-import {Command} from '../src'
+import {Command} from '../src/index.js'
 
 type Favorite = {
   id: string;

examples/login.ts

@@ -1,4 +1,4 @@
-import {Command, flags} from '../src'
+import {Command, flags} from '../src/index.js'
 
 class LoginCommand extends Command {
   static flags = {

examples/logout.ts

@@ -1,4 +1,4 @@
-import {Command} from '../src'
+import {Command} from '../src/index.js'
 
 class LogoutCommand extends Command {
   async run() {

examples/run.sh

@@ -13,4 +13,4 @@ if [ ! -f "examples/$COMMAND.ts" ]; then
   exit 1
 fi
 
-./node_modules/.bin/ts-node "examples/$COMMAND.ts" "$@" 
+node --loader ts-node/esm "examples/$COMMAND.ts" "$@"

examples/status.ts

@@ -1,7 +1,8 @@
+console.log('Starting status example')
 import {HTTP} from '@heroku/http-call'
 import {ux} from '@oclif/core'
 
-import {Command} from '../src'
+import {Command} from '../src/command.js'
 
 class StatusCommand extends Command {
   async run() {
@@ -26,4 +27,7 @@ class StatusCommand extends Command {
 }
 
 (StatusCommand.run([]) as any)
-  .catch(require('@oclif/core').Errors.handle)
+  .catch((err: any) => {
+    console.error('Caught error:', err);
+    require('@oclif/core').Errors.handle(err);
+  });

examples/whoami.ts

@@ -1,7 +1,7 @@
 import * as Heroku from '@heroku-cli/schema'
 import {ux} from '@oclif/core'
 
-import {Command} from '../src'
+import {Command} from '../src/index.js'
 
 class StatusCommand extends Command {
   notloggedin() {

package-lock.json

@@ -18,6 +18,7 @@
   "devDependencies": {
     "@heroku-cli/schema": "^1.0.25",
     "@types/chai": "^5.2.2",
+    "@types/debug": "^4.1.2",
     "@types/inquirer": "^8.2.11",
     "@types/mocha": "^10.0.6",
     "@types/node": "22.15.21",
@@ -80,5 +81,6 @@
     "changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s",
     "example": "sh examples/run.sh"
   },
+  "type": "module",
   "types": "./lib/index.d.ts"
 }

package.json

@@ -1,18 +1,18 @@
 import {HTTP, HTTPError, HTTPRequestOptions} from '@heroku/http-call'
 import {Errors, Interfaces} from '@oclif/core'
+import debug from 'debug'
 import inquirer from 'inquirer'
-import Netrc from 'netrc-parser'
 import * as url from 'node:url'
-
-import deps from './deps'
-import {Login} from './login'
-import {Mutex} from './mutex'
-import {IDelinquencyConfig, IDelinquencyInfo, ParticleboardClient} from './particleboard-client'
-import {RequestId, requestIdHeader} from './request-id'
-import {vars} from './vars'
-
-const debug = require('debug')
-
+import {Login} from './login.js'
+import {Mutex} from './mutex.js'
+import {IDelinquencyConfig, IDelinquencyInfo, ParticleboardClient} from './particleboard-client.js'
+import {RequestId, requestIdHeader} from './request-id.js'
+import {vars} from './vars.js'
+import {yubikey} from './yubikey.js'
+
+// Use top-level await for dynamic import
+const Netrc = (await import('netrc-parser')).default;
+const netrc = new (Netrc as any)();
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace APIClient {
   export interface Options extends HTTPRequestOptions {
@@ -86,7 +86,7 @@ export class APIClient {
       protocol: apiUrl.protocol,
     }
     const delinquencyConfig: IDelinquencyConfig = {fetch_delinquency: false, warning_shown: false}
-    this.http = class APIHTTPClient<T> extends deps.HTTP.HTTP.create(opts)<T> {
+    this.http = class APIHTTPClient<T> extends HTTP.create(opts)<T> {
       static configDelinquency(url: string, opts: APIClient.Options): void {
         if (opts.method?.toUpperCase() !== 'GET' || (opts.hostname && opts.hostname !== apiUrl.hostname)) {
           delinquencyConfig.fetch_delinquency = false
@@ -193,7 +193,7 @@ export class APIClient {
           this.showWarnings<T>(response)
           return response
         } catch (error) {
-          if (!(error instanceof deps.HTTP.HTTPError)) throw error
+          if (!(error instanceof HTTPError)) throw error
           if (retries > 0) {
             if (opts.retryAuth !== false && error.http.statusCode === 401 && error.body.id === 'unauthorized') {
               if (process.env.HEROKU_API_KEY) {
@@ -258,11 +258,11 @@ export class APIClient {
 
   get auth(): string | undefined {
     if (!this._auth) {
-      if (process.env.HEROKU_API_TOKEN && !process.env.HEROKU_API_KEY) deps.cli.warn('HEROKU_API_TOKEN is set but you probably meant HEROKU_API_KEY')
+      if (process.env.HEROKU_API_TOKEN && !process.env.HEROKU_API_KEY) Errors.warn('HEROKU_API_TOKEN is set but you probably meant HEROKU_API_KEY')
       this._auth = process.env.HEROKU_API_KEY
       if (!this._auth) {
-        deps.netrc.loadSync()
-        this._auth = deps.netrc.machines[vars.apiHost] && deps.netrc.machines[vars.apiHost].password
+        netrc.loadSync()
+        this._auth = netrc.machines[vars.apiHost] && netrc.machines[vars.apiHost].password
       }
     }
 
@@ -280,13 +280,13 @@ export class APIClient {
 
   get particleboard(): ParticleboardClient {
     if (this._particleboard) return this._particleboard
-    this._particleboard = new deps.ParticleboardClient(this.config)
+    this._particleboard = new ParticleboardClient(this.config)
     return this._particleboard
   }
 
   get twoFactorMutex(): Mutex<string> {
     if (!this._twoFactorMutex) {
-      this._twoFactorMutex = new deps.Mutex()
+      this._twoFactorMutex = new Mutex()
     }
 
     return this._twoFactorMutex
@@ -311,9 +311,9 @@ export class APIClient {
       if (error instanceof Errors.CLIError) Errors.warn(error)
     }
 
-    delete Netrc.machines['api.heroku.com']
-    delete Netrc.machines['git.heroku.com']
-    await Netrc.save()
+    delete netrc.machines['api.heroku.com']
+    delete netrc.machines['git.heroku.com']
+    await netrc.save()
   }
 
   patch<T>(url: string, options: APIClient.Options = {}) {
@@ -343,7 +343,7 @@ export class APIClient {
   }
 
   twoFactorPrompt() {
-    deps.yubikey.enable()
+    yubikey.enable()
     return this.twoFactorMutex.synchronize(async () => {
       try {
         const {factor} = await inquirer.prompt([{
@@ -352,10 +352,10 @@ export class APIClient {
           name: 'factor',
           type: 'password',
         }])
-        deps.yubikey.disable()
+        yubikey.disable()
         return factor
       } catch (error) {
-        deps.yubikey.disable()
+        yubikey.disable()
         throw error
       }
     })

src/api-client.ts

@@ -1,18 +1,23 @@
 import {Command as Base} from '@oclif/core'
-import {
+import type {
   ArgOutput,
   FlagOutput,
   Input,
   ParserOutput,
-} from '@oclif/core/lib/interfaces/parser'
-import {NonExistentFlagsError} from '@oclif/core/lib/parser/errors'
+} from '@oclif/core/lib/interfaces/parser.js'
+import {NonExistentFlagsError} from '@oclif/core/lib/parser/errors.js'
+import * as fs from 'node:fs'
+import path from 'node:path'
+import {fileURLToPath} from 'node:url'
 import parser from 'yargs-parser'
 import unparser from 'yargs-unparser'
 
-const pjson = require('../package.json')
+import {APIClient, IOptions} from './api-client.js'
 
-import {APIClient, IOptions} from './api-client'
-import deps from './deps'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const packageJsonPath = path.resolve(__dirname, '../../../package.json')
+const pjson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
 
 export abstract class Command extends Base {
   allowArbitraryFlags: boolean = false
@@ -25,7 +30,7 @@ export abstract class Command extends Base {
       debug: process.env.HEROKU_DEBUG === '1' || process.env.HEROKU_DEBUG?.toUpperCase() === 'TRUE',
       debugHeaders: process.env.HEROKU_DEBUG_HEADERS === '1' || process.env.HEROKU_DEBUG_HEADERS?.toUpperCase() === 'TRUE',
     }
-    this._heroku = new deps.APIClient(this.config, options)
+    this._heroku = new APIClient(this.config, options)
     return this._heroku
   }
 

src/command.ts

@@ -1,13 +1,13 @@
 import {Errors, Interfaces} from '@oclif/core'
 import * as path from 'node:path'
-
-import deps from './deps'
-import {configRemote, getGitRemotes} from './git'
+import {APIClient} from './api-client.js'
+import * as file from './file.js'
+import {configRemote, getGitRemotes} from './git.js'
 
 export const oneDay = 60 * 60 * 24
 
 export const herokuGet = async (resource: string, ctx: {config: Interfaces.Config}): Promise<string[]> => {
-  const heroku = new deps.APIClient(ctx.config)
+  const heroku = new APIClient(ctx.config)
   let {body: resources} = await heroku.get<any>(`/${resource}`)
   if (typeof resources === 'string') resources = JSON.parse(resources)
   return resources.map((a: any) => a.name).sort()
@@ -71,7 +71,7 @@ export const DynoSizeCompletion = {
 
 export const FileCompletion = {
   async options() {
-    const files = await deps.file.readdir(process.cwd())
+    const files = await file.readdir(process.cwd())
     return files
   },
 
@@ -91,7 +91,7 @@ export const ProcessTypeCompletion = {
     let types: string[] = []
     const procfile = path.join(process.cwd(), 'Procfile')
     try {
-      const buff = await deps.file.readFile(procfile)
+      const buff = await file.readFile(procfile)
       types = buff
         .toString()
         .split('\n')

src/completions.ts

@@ -1,9 +1,10 @@
-import * as fs from 'fs'
-import {promisify} from 'util'
+import * as fs from 'node:fs'
+import {promisify} from 'node:util'
+import debugModule from 'debug'
 
 let _debug: any
 function debug(...args: any[]) {
-  if (_debug) _debug = require('debug')('@heroku-cli/command:file')
+  if (!_debug) _debug = debugModule('@heroku-cli/command:file')
   _debug(...args)
 }
 

src/deps.ts

@@ -1,6 +1,6 @@
 import {Errors, Flags} from '@oclif/core'
 
-import {IGitRemotes, configRemote, getGitRemotes} from '../git'
+import {IGitRemotes, configRemote, getGitRemotes} from '../git.js'
 
 class MultipleRemotesError extends Errors.CLIError {
   constructor(gitRemotes: IGitRemotes[]) {

src/file.ts

@@ -1,9 +1,9 @@
 import {Flags} from '@oclif/core'
 
-export {app, remote} from './app'
-export {org} from './org'
-export {pipeline} from './pipeline'
-export {team} from './team'
+export {app, remote} from './app.js'
+export {org} from './org.js'
+export {pipeline} from './pipeline.js'
+export {team} from './team.js'
 
 // Explicitly export oclif flag types using object destructuring, sorted alphabetically
 export const {boolean, custom, directory, file, integer, option, string, url} = Flags