refactor: Migrate --pretty CLI option to --indent

eemeli · Jul 1, 2024 · 1d776a9 · 1d776a9
1 parent f7fb67f
commit 1d776a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/docs/09_cli.md b/docs/09_cli.md
@@ -16,7 +16,7 @@ Usage:
 Options:
   --help, -h    Show this message.
   --json, -j    Output JSON.
-  --pretty, -p  Output pretty-printed JSON.
+  --indent 2    Output pretty-printed data, indented by the given number of spaces.
 
 Additional options for bare "yaml" command:
   --doc, -d     Output pretty-printed JS Document objects.

diff --git a/src/cli.ts b/src/cli.ts
@@ -57,11 +57,11 @@ export async function cli(
         doc: { type: 'boolean', short: 'd' },
         help: { type: 'boolean', short: 'h' },
         json: { type: 'boolean', short: 'j' },
-        pretty: { type: 'boolean', short: 'p' },
         single: { type: 'boolean', short: '1' },
         strict: { type: 'boolean', short: 's' },
         visit: { type: 'string', short: 'v' },
-        yaml: { type: 'string', default: '1.2' }
+        yaml: { type: 'string', default: '1.2' },
+        indent: { type: 'string', short: 'i' }
       }
     })
   } catch (error) {
@@ -190,8 +190,7 @@ export async function cli(
           )
         }
         if (mode !== 'valid' && opt.json) {
-          const indent = opt.pretty ? 2 : 0
-          console.log(JSON.stringify(opt.single ? data[0] : data, null, indent))
+          console.log(JSON.stringify(opt.single ? data[0] : data, null, Number(opt.indent)))
         }
         done()
       })

diff --git a/tests/cli.ts b/tests/cli.ts
@@ -114,23 +114,23 @@ const skip = Number(major) < 20
         ['[{"hello":"world"},42]']
       )
     })
-    describe('--pretty', () => {
+    describe('--indent', () => {
       ok(
         'basic',
         'hello: world',
-        ['--json', '--pretty'],
+        ['--json', '--indent', '2'],
         ['[\n  {\n    "hello": "world"\n  }\n]']
       )
       ok(
         '--single',
         'hello: world',
-        ['--json', '--pretty', '--single'],
+        ['--json', '--indent', '2', '--single'],
         ['{\n  "hello": "world"\n}']
       )
       ok(
         'multiple',
         'hello: world\n---\n42',
-        ['--json', '--pretty'],
+        ['--json', '--indent', '2'],
         ['[\n  {\n    "hello": "world"\n  },\n  42\n]']
       )
     })