Revert "fix: alt values for process.stdout.columns (#131)"

This reverts commit 4956ac8.

Author: iowillhoit

examples/no-width-table.ts

@@ -27,7 +27,6 @@ import {
   determineConfiguredWidth,
   determineWidthOfWrappedText,
   getColumns,
-  getColumnWidth,
   getHeadings,
   intersperse,
   maybeStripAnsi,
@@ -432,7 +431,7 @@ const createStdout = (): FakeStdout => {
   // https://github.com/vadimdemedes/ink/blob/v5.0.1/src/ink.tsx#L174
   // This might be a bad idea but it works.
   stdout.rows = 10_000
-  stdout.columns = getColumnWidth();
+  stdout.columns = process.stdout.columns ?? 80
   const frames: string[] = []
 
   stdout.write = (data: string) => {
@@ -569,7 +568,8 @@ export function printTables<T extends Record<string, unknown>[]>(
   const output = new Output()
   const leftMargin = options?.marginLeft ?? options?.margin ?? 0
   const rightMargin = options?.marginRight ?? options?.margin ?? 0
-  const columns = getColumnWidth() - (leftMargin + rightMargin)
+  const columns = process.stdout.columns - (leftMargin + rightMargin)
+
   const processed = tables.map((table) => ({
     ...table,
     // adjust maxWidth to account for margin and columnGap

src/table.tsx

@@ -51,15 +51,6 @@ export function determineWidthOfWrappedText(text: string): number {
   return lines.reduce((max, line) => Math.max(max, line.length), 0)
 }
 
-// In certain systems, `process.stdout.columns` can be 0
-// The column width is calculated by:
-// 1. The value of `OCLIF_TABLE_COLUMN_OVERRIDE` (if set)
-// 2. The value of `process.stdout.columns`
-// 3. If `process.stdout.columns` is 0, use 80
-export function getColumnWidth(): number {
-  return Number.parseInt(process.env.OCLIF_TABLE_COLUMN_OVERRIDE || '0', 10) || process.stdout.columns || 80
-}
-
 /**
  * Determines the configured width based on the provided width value.
  * If no width is provided, it returns the width of the current terminal.
@@ -72,7 +63,7 @@ export function getColumnWidth(): number {
  */
 export function determineConfiguredWidth(
   providedWidth: number | Percentage | undefined,
-  columns = getColumnWidth(),
+  columns = process.stdout.columns,
 ): number {
   if (!providedWidth) return columns
 

src/utils.ts

@@ -718,90 +718,4 @@ describe('printTable compatibility with @oclif/test', () => {
     )
     expect(stdout).to.equal(expected)
   })
-
-  it('prints full table with no set width', async () => {
-    console.log(process.stdout.columns)
-    const data = [
-      {name: 'Foo', age: '1'.repeat(60)},
-      {name: 'Bar', age: '2'.repeat(60)},
-    ]
-
-    const expected = `┌──────┬──────────────────────────────────────────────────────────────┐
-│ name │ age                                                          │
-├──────┼──────────────────────────────────────────────────────────────┤
-│ Foo  │ 111111111111111111111111111111111111111111111111111111111111 │
-├──────┼──────────────────────────────────────────────────────────────┤
-│ Bar  │ 222222222222222222222222222222222222222222222222222222222222 │
-└──────┴──────────────────────────────────────────────────────────────┘
-
-`
-
-    const {stdout} = await captureOutput(async () =>
-      printTable({
-        data,
-        columns: ['name', 'age'],
-      }),
-    )
-    expect(stdout).to.equal(expected)
-  })
-
-  it('should use width of 80 if process.stdout.columns is 0', async () => {
-    const backupColumns = process.stdout.columns
-    process.stdout.columns = 0
-    const data = [
-      {name: 'Foo', age: '1'.repeat(100)},
-      {name: 'Bar', age: '2'.repeat(100)},
-    ]
-
-    const expected = `┌──────┬───────────────────────────────────────────────────────────────────────┐
-│ name │ age                                                                   │
-├──────┼───────────────────────────────────────────────────────────────────────┤
-│ Foo  │ 11111111111111111111111111111111111111111111111111111111111111111111… │
-├──────┼───────────────────────────────────────────────────────────────────────┤
-│ Bar  │ 22222222222222222222222222222222222222222222222222222222222222222222… │
-└──────┴───────────────────────────────────────────────────────────────────────┘
-
-`
-
-    const {stdout} = await captureOutput(async () =>
-      printTable({
-        data,
-        columns: ['name', 'age'],
-      }),
-    )
-    expect(stdout).to.equal(expected)
-
-    process.stdout.columns = backupColumns;
-  })
-
-  it('should respect the OCLIF_TABLE_COLUMN_OVERRIDE env var', async () => {
-    const backupColumns = process.stdout.columns
-    process.stdout.columns = 0
-    process.env.OCLIF_TABLE_COLUMN_OVERRIDE = '50'
-    const data = [
-      {name: 'Foo', age: '1'.repeat(100)},
-      {name: 'Bar', age: '2'.repeat(100)},
-    ]
-
-    const expected = `┌──────┬─────────────────────────────────────────┐
-│ name │ age                                     │
-├──────┼─────────────────────────────────────────┤
-│ Foo  │ 11111111111111111111111111111111111111… │
-├──────┼─────────────────────────────────────────┤
-│ Bar  │ 22222222222222222222222222222222222222… │
-└──────┴─────────────────────────────────────────┘
-
-`
-
-    const {stdout} = await captureOutput(async () =>
-      printTable({
-        data,
-        columns: ['name', 'age'],
-      }),
-    )
-    expect(stdout).to.equal(expected)
-
-    delete process.env.OCLIF_TABLE_COLUMN_OVERRIDE;
-    process.stdout.columns = backupColumns;
-  })
 })

test/table.test.tsx

@@ -1,6 +1,6 @@
 import {config, expect} from 'chai'
 
-import {getColumnWidth, intersperse, sortData} from '../src/utils.js'
+import {intersperse, sortData} from '../src/utils.js'
 
 config.truncateThreshold = 0
 
@@ -64,28 +64,3 @@ describe('sortData', () => {
     expect(sortData(data, sort)).to.deep.equal(expected)
   })
 })
-
-describe('should get the correct column width', () => {
-  it('should return the value of OCLIF_TABLE_COLUMN_OVERRIDE', () => {
-    process.env.OCLIF_TABLE_COLUMN_OVERRIDE = '100'
-    expect(getColumnWidth()).to.equal(100)
-    delete process.env.OCLIF_TABLE_COLUMN_OVERRIDE
-  })
-
-  it('should return the value of process.stdout.columns', () => {
-    if (process.env.CI && !process.stdout.columns) {
-      // In GHA process.stdout.columns is undefined
-      expect(getColumnWidth()).to.equal(80)
-    } else {
-      const currentColumns = process.stdout.columns
-      expect(getColumnWidth()).to.equal(currentColumns)
-    }
-  })
-
-  it('should return the default value of 80', () => {
-    const backupColumns = process.stdout.columns
-    process.stdout.columns = 0
-    expect(getColumnWidth()).to.equal(80)
-    process.stdout.columns = backupColumns
-  })
-})